tim peng
fe60bbf4b3
Merge "Change the wording from "Stop casting" to "Stop"" into rvc-dev am: 58f9d0c7b9 am: 434ec84186 am: 4c66989e41 am: 7e3d1754eb
...
Change-Id: Iee96d3817986a5c2a6e47ec7b6711ce345b1c675
2020-04-21 07:01:24 +00:00
Bonian Chen
5b6c7a976e
Merge "[Settings] Avoid from EUICC access blocking main thread" into rvc-dev am: 7606dfd931
...
Change-Id: I3b9f0c36b51c1a27976e3d40aaaec257c137f256
2020-04-21 07:01:17 +00:00
Xiangyu/Malcolm Chen
9df4b0ce58
Merge "Define a helper link for 5G limitation in DSDS footer." into rvc-dev am: eb27c7d94a
...
Change-Id: I1a56d11a7c96f970fe1b0fe929e47f165ac1df29
2020-04-21 07:00:43 +00:00
Bonian Chen
7fdf4b50b1
Merge "[Settings] Avoid from EUICC access blocking main thread" into rvc-dev am: 7606dfd931
...
Change-Id: Ia7987b7418b430b0ae85b3340f29c2b52689f7eb
2020-04-21 07:00:34 +00:00
Xiangyu/Malcolm Chen
eb27c7d94a
Merge "Define a helper link for 5G limitation in DSDS footer." into rvc-dev
2020-04-21 06:47:18 +00:00
Bonian Chen
9bc2f7f8bc
[Settings] Code refactor
...
Minor code refactor
Bug: 141833767
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsagePreferenceControllerTest
Change-Id: I060e7c880d91a0e5059610c5ceae319d47c19c7a
2020-04-21 14:43:48 +08:00
Bonian Chen
7606dfd931
Merge "[Settings] Avoid from EUICC access blocking main thread" into rvc-dev
2020-04-21 06:40:40 +00:00
tim peng
56d5874f7f
Merge "Change the wording from "Stop casting" to "Stop"" into rvc-dev am: 58f9d0c7b9 am: c118a89a68 am: d91b23f5e3
...
Change-Id: I5fd1c9667e4b865afb6aecd6dde45c26948f6052
2020-04-21 06:35:18 +00:00
tim peng
7e2f5f34be
Merge "Change the wording from "Stop casting" to "Stop"" into rvc-dev am: 58f9d0c7b9 am: 434ec84186 am: ae08d2a6e0
...
Change-Id: I8076effe04577a8741fcbfc278a861cdde47b392
2020-04-21 06:35:04 +00:00
tim peng
7e3d1754eb
Merge "Change the wording from "Stop casting" to "Stop"" into rvc-dev am: 58f9d0c7b9 am: 434ec84186 am: 4c66989e41
...
Change-Id: I610be3bc9488ddd197cf923544057dddef88038a
2020-04-21 06:34:14 +00:00
tim peng
d91b23f5e3
Merge "Change the wording from "Stop casting" to "Stop"" into rvc-dev am: 58f9d0c7b9 am: c118a89a68
...
Change-Id: I527cd5cae30741ac8d32d4dc04c5600c616442f9
2020-04-21 06:23:17 +00:00
tim peng
4c66989e41
Merge "Change the wording from "Stop casting" to "Stop"" into rvc-dev am: 58f9d0c7b9 am: 434ec84186
...
Change-Id: I79b2a3bfedd7ede394d2f36b07fe897cdd98de04
2020-04-21 06:23:16 +00:00
tim peng
ae08d2a6e0
Merge "Change the wording from "Stop casting" to "Stop"" into rvc-dev am: 58f9d0c7b9 am: 434ec84186
...
Change-Id: I3fe35e36decb38d96540649025fa20e39317c1c4
2020-04-21 06:22:27 +00:00
tim peng
c118a89a68
Merge "Change the wording from "Stop casting" to "Stop"" into rvc-dev am: 58f9d0c7b9
...
Change-Id: Ie53b603df317bbc96d64d0796551745f3754bce9
2020-04-21 06:10:05 +00:00
tim peng
434ec84186
Merge "Change the wording from "Stop casting" to "Stop"" into rvc-dev am: 58f9d0c7b9
...
Change-Id: I7e9d43442830167d5764739ff64a1833de6accb0
2020-04-21 06:09:15 +00:00
tim peng
58f9d0c7b9
Merge "Change the wording from "Stop casting" to "Stop"" into rvc-dev
2020-04-21 05:51:25 +00:00
tim peng
cb9095faf7
Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev am: db86b2ef2a am: f864bed27e am: 7fdd5143df am: 108c131b67 am: 917869639b
...
Change-Id: I4abbd32f14270e5d9daf4b0a6700229f48cf2b6a
2020-04-21 03:46:08 +00:00
tim peng
917869639b
Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev am: db86b2ef2a am: f864bed27e am: 7fdd5143df am: 108c131b67
...
Change-Id: Ibee2a828b934fa74a886e96f4450e99d86c637d2
2020-04-21 03:33:34 +00:00
tim peng
c06f0210cc
Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev am: db86b2ef2a am: ab1a5a5fa0 am: d4580c856b am: cb83a11883
...
Change-Id: I3a51967b20566b127e9d65021d17b1e744147d3f
2020-04-21 03:33:09 +00:00
tim peng
96f3309f58
Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev am: db86b2ef2a am: f864bed27e am: a50534ad62 am: 131e589a94
...
Change-Id: I2efadcae636927b65fc4a8a7e2707242de1a3b35
2020-04-21 03:33:02 +00:00
tim peng
cb83a11883
Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev am: db86b2ef2a am: ab1a5a5fa0 am: d4580c856b
...
Change-Id: Ic62e27b06112a43b7b40ac6546926812d359ecf5
2020-04-21 03:15:33 +00:00
tim peng
131e589a94
Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev am: db86b2ef2a am: f864bed27e am: a50534ad62
...
Change-Id: I201ddb8d0700f96faa69f7e6b054242f8ff852ac
2020-04-21 03:15:25 +00:00
tim peng
108c131b67
Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev am: db86b2ef2a am: f864bed27e am: 7fdd5143df
...
Change-Id: I6193c62bf5be2800f6f78ca040a2dd88c7f67951
2020-04-21 03:15:04 +00:00
tim peng
7fdd5143df
Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev am: db86b2ef2a am: f864bed27e
...
Change-Id: Iefa9abd901b78d8adffebc27701394f678c09a03
2020-04-21 02:55:39 +00:00
tim peng
d4580c856b
Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev am: db86b2ef2a am: ab1a5a5fa0
...
Change-Id: I465c07baa584a29f27b37f2a028197187811a07b
2020-04-21 02:55:39 +00:00
tim peng
a50534ad62
Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev am: db86b2ef2a am: f864bed27e
...
Change-Id: I3fb1da1317942be19571153d35c133fc69110fd8
2020-04-21 02:54:43 +00:00
tim peng
ab1a5a5fa0
Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev am: db86b2ef2a
...
Change-Id: Ia7455d79077b2cc0ec08916bdc66cb30e6ea4616
2020-04-21 02:34:26 +00:00
tim peng
f864bed27e
Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev am: db86b2ef2a
...
Change-Id: I7390f6a18144c796e5fb9a297c4678d469a1808a
2020-04-21 02:33:40 +00:00
Tim Peng
4fe1de57a5
Change the wording from "Stop casting" to "Stop"
...
-The string is freezed. Reuse current "Stop" string
Bug: 153705889
Test: make -j42 RunSettingsRoboTests
Change-Id: I39184dcbfda5937677ab171a66ad5dcbbb8e6b68
2020-04-21 10:22:15 +08:00
tim peng
db86b2ef2a
Merge "Hide volume slider in Output Switcher when volume adjustment is restricted" into rvc-dev
2020-04-21 02:17:30 +00:00
Brad Ebinger
c42562d6f7
[automerger skipped] Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" am: a7bf6a3046 am: f82153c3ec -s ours am: aa1ca9c180 -s ours am: 61a44018eb -s ours am: 4e366cf122 -s ours
...
am skip reason: Change-Id Iadc46ac18c1ec8e63cfe0d4d162e7222bfbc9a12 with SHA-1 de2ffe1f16
2020-04-20 22:39:21 +00:00
Brad Ebinger
2459ffecfb
[automerger skipped] Merge "Set the CHAR_LIMIT to 110 in order to support more translations." am: a9295ea648 am: 2c60eb8851 -s ours am: 52cb98cac1 -s ours am: 8c2de745c6 -s ours am: eca5c02f71 -s ours
...
am skip reason: Change-Id Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c with SHA-1 95aeac6790
2020-04-20 22:37:43 +00:00
Brad Ebinger
4e366cf122
[automerger skipped] Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" am: a7bf6a3046 am: f82153c3ec -s ours am: aa1ca9c180 -s ours am: 61a44018eb -s ours
...
am skip reason: Change-Id Iadc46ac18c1ec8e63cfe0d4d162e7222bfbc9a12 with SHA-1 de2ffe1f16
2020-04-20 22:21:09 +00:00
Brad Ebinger
eca5c02f71
[automerger skipped] Merge "Set the CHAR_LIMIT to 110 in order to support more translations." am: a9295ea648 am: 2c60eb8851 -s ours am: 52cb98cac1 -s ours am: 8c2de745c6 -s ours
...
am skip reason: Change-Id Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c with SHA-1 95aeac6790
2020-04-20 22:18:06 +00:00
Brad Ebinger
61a44018eb
[automerger skipped] Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" am: a7bf6a3046 am: f82153c3ec -s ours am: aa1ca9c180 -s ours
...
am skip reason: Change-Id Iadc46ac18c1ec8e63cfe0d4d162e7222bfbc9a12 with SHA-1 de2ffe1f16
2020-04-20 21:54:44 +00:00
Brad Ebinger
8c2de745c6
[automerger skipped] Merge "Set the CHAR_LIMIT to 110 in order to support more translations." am: a9295ea648 am: 2c60eb8851 -s ours am: 52cb98cac1 -s ours
...
am skip reason: Change-Id Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c with SHA-1 95aeac6790
2020-04-20 21:52:44 +00:00
Brad Ebinger
aa1ca9c180
[automerger skipped] Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" am: a7bf6a3046 am: f82153c3ec -s ours
...
am skip reason: Change-Id Iadc46ac18c1ec8e63cfe0d4d162e7222bfbc9a12 with SHA-1 de2ffe1f16
2020-04-20 21:29:31 +00:00
Brad Ebinger
52cb98cac1
[automerger skipped] Merge "Set the CHAR_LIMIT to 110 in order to support more translations." am: a9295ea648 am: 2c60eb8851 -s ours
...
am skip reason: Change-Id Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c with SHA-1 95aeac6790
2020-04-20 21:29:23 +00:00
Brad Ebinger
f82153c3ec
Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" am: a7bf6a3046
...
Change-Id: I765918f1712bb80006a3d0751a84477a94c2d432
2020-04-20 21:06:10 +00:00
Brad Ebinger
2c60eb8851
Merge "Set the CHAR_LIMIT to 110 in order to support more translations." am: a9295ea648
...
Change-Id: I1d6e0324ee8db02a75e3f14ebfe24fad369b0bd2
2020-04-20 21:04:14 +00:00
Xiangyu/Malcolm Chen
9c3d1a0073
Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: 8ca377ffd4 am: db0a05c926 am: 791b99a6fe am: 047ca2c76f
...
Change-Id: I407be41eaf20f212b5fa899ba974a4c2e32cee3d
2020-04-20 20:43:35 +00:00
Xiangyu/Malcolm Chen
4d7c1b45ad
Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: f181589b71 am: 0ab56379e4 am: 9dd603451b
...
Change-Id: I043570030a54a6b96871363179287caad9e20851
2020-04-20 20:41:57 +00:00
Brad Ebinger
a7bf6a3046
Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback"
2020-04-20 20:40:50 +00:00
Xiangyu/Malcolm Chen
fdb2d434ff
Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: 8ca377ffd4 am: d781fe860c am: 4d35849139
...
Change-Id: Ibefe3cd3e37ebe3ae3f1b5f5d7044d50fd9d7e53
2020-04-20 20:40:32 +00:00
Brad Ebinger
a9295ea648
Merge "Set the CHAR_LIMIT to 110 in order to support more translations."
2020-04-20 20:40:02 +00:00
Xiangyu/Malcolm Chen
047ca2c76f
Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: 8ca377ffd4 am: db0a05c926 am: 791b99a6fe
...
Change-Id: I8d45001f7acdebcd16c91b718185ae68f0aca78a
2020-04-20 20:37:09 +00:00
Xiangyu/Malcolm Chen
9dd603451b
Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: f181589b71 am: 0ab56379e4
...
Change-Id: Idf6b0dfe42d0f2037d1440b8fd34d0b314bab891
2020-04-20 20:13:03 +00:00
Xiangyu/Malcolm Chen
791b99a6fe
Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: 8ca377ffd4 am: db0a05c926
...
Change-Id: Icaaf82055dae2b1ba4f37253e61b721b76d5cfec
2020-04-20 20:12:35 +00:00
Xiangyu/Malcolm Chen
4d35849139
Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: 8ca377ffd4 am: d781fe860c
...
Change-Id: Ibfadbaaebf3278f6916e5ce6d14d4f112eee6aea
2020-04-20 20:12:13 +00:00
Xiangyu/Malcolm Chen
0ab56379e4
Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: f181589b71
...
Change-Id: I1b08ab7479a81efef8b5adb72a78385cff83a4c6
2020-04-20 19:49:33 +00:00
