Bonian Chen
c1eb5bf440
Merge "[Settings] Code refactor" into rvc-dev am: 5bc8aa7961
...
Change-Id: Ie76ffbf51abd1550f40a053d32e2dc65afac6cf9
2020-04-21 08:25:47 +00:00
Bonian Chen
5bc8aa7961
Merge "[Settings] Code refactor" into rvc-dev
2020-04-21 08:21:28 +00:00
Bonian Chen
ab0c02393e
Merge "[Settings] Support of DSDS API" into rvc-dev am: 57c2df4c7c
...
Change-Id: I54de1254ccb967fc40d1b3533b67d725feb0baa7
2020-04-21 08:18:28 +00:00
Bonian Chen
57c2df4c7c
Merge "[Settings] Support of DSDS API" into rvc-dev
2020-04-21 07:55:07 +00:00
Xiangyu/Malcolm Chen
88bf3999d1
Merge "Define a helper link for 5G limitation in DSDS footer." into rvc-dev am: eb27c7d94a
...
Change-Id: I1123f2c8bf6a4bbc6fe2a4c84813446fc9df3eef
2020-04-21 07:01:26 +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
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
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
58f9d0c7b9
Merge "Change the wording from "Stop casting" to "Stop"" into rvc-dev
2020-04-21 05:51:25 +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
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
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
is in history
Change-Id: Ia23bb55900200ca47b093aead2430e06fc9126a0
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
is in history
Change-Id: Iade0e884c0b5e98704e6892b1cbbd66b0d3d9c36
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
Brad Ebinger
a7bf6a3046
Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback"
2020-04-20 20:40:50 +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
f181589b71
Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5
...
Change-Id: I2e35616ac335cfb257d2de74ac83582f3b6019fb
2020-04-20 19:28:16 +00:00
Malcolm Chen
80be9de6d0
Define a helper link for 5G limitation in DSDS footer.
...
Bug: 152786064
Test: manual
Change-Id: I5a02f847531988217cc6ab47e3b35ed319c1027c
2020-04-20 19:12:16 +00:00
Xiangyu/Malcolm Chen
9674276bb5
Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev
2020-04-20 19:10:15 +00:00
Brad Ebinger
6b87fa6705
Set the CHAR_LIMIT to 110 in order to support more translations.
...
Increase the CHAR_LIMIT for contact_discovery_opt_in_summary.
Fixes: 153376000
Fixes: 150941009
Test: manual
Merged-In: Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c
Change-Id: Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c
2020-04-20 12:08:58 -07:00
Brad Ebinger
f6a1184c0f
Change to Contact Discovery Dialog Language based on Privacy Feedback
...
Fixes: 153376820
Bug: 141950843
Test: verify text
Merged-In: Iadc46ac18c1ec8e63cfe0d4d162e7222bfbc9a12
Change-Id: Iadc46ac18c1ec8e63cfe0d4d162e7222bfbc9a12
2020-04-20 19:08:07 +00:00
Julia Reynolds
44aed00a26
Merge "Set explicit back target for history" into rvc-dev am: bb979153ed
...
Change-Id: Ic0b76edf0c67693ac0563ce1b8bdc0f69ffcf17e
2020-04-20 17:54:44 +00:00
Julia Reynolds
bb979153ed
Merge "Set explicit back target for history" into rvc-dev
2020-04-20 17:40:18 +00:00
jasonwshsu
615a2398fe
Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11
...
Change-Id: Ia03258348afbbdf9549c1fadd4038be75ced45c0
2020-04-20 16:44:31 +00:00
Julia Reynolds
6c8451a89f
Set explicit back target for history
...
Test: manual
Fixes: 153554906
Change-Id: Ic3198afae878e3cfbfbfa7e72b1c71a6f4e74a2e
2020-04-20 11:31:43 -04:00
jasonwshsu
1be2666d11
Remove unused attribute 'EXTRA_SUMMARY_RES'
...
* Magnification already use EXTRA_HTML_DESCRIPTION to replace it.
Bug: 154092127
Test: manual test
Change-Id: I5385907eb0911894159a80444493bf233bb43e1a
2020-04-20 23:09:59 +08:00
Julia Reynolds
7f486ec9d7
Merge "Update conversation bubble settings" into rvc-dev am: 608bd69328
...
Change-Id: I722abcb6f7b6be50ddbb8997e48bf6bf4f218e47
2020-04-20 13:39:23 +00:00
Julia Reynolds
608bd69328
Merge "Update conversation bubble settings" into rvc-dev
2020-04-20 13:16:57 +00:00
Tim Peng
71dd32ded0
Hide volume slider in Output Switcher when volume adjustment is restricted
...
-Check UserManager.DISALLOW_ADJUST_VOLUME
-Hide slider when unsupported
Bug: 153922342
Test: 1.Open CTS-V app > Device Owner Tests
2.install CtsEmptyDeviceOwner.apk -"adb install -r -t CtsEmptyDeviceOwner.apk"
3.enter the command "adb shell dpm set-device-owner com.android.cts.emptydeviceowner/.EmptyDeviceAdmin"
4.push Check device owner button
5.open Policy transparency test and go to Disallow adjust volume > Enable the switch > Open settings.
Change-Id: Iac2793ead6d93d4eaada19c4eec33885d4b97138
2020-04-20 09:09:07 +00:00
TreeHugger Robot
e0311ea5bc
Merge "Make ActionDisabledByAdminDialog can adopt selected font" into rvc-dev am: 12a838d1f6
...
Change-Id: Ib0a2f2c1dd9ea3f08133e5989372db04d2c0fb17
2020-04-20 06:41:38 +00:00
Bonian Chen
9f4efa0ea2
Merge "[DataUsage] UX enhancement" into rvc-dev am: d9dadc0511
...
Change-Id: I613fbf2dc6e744958065f05f9fb392ddc9e1af36
2020-04-20 06:41:27 +00:00
TreeHugger Robot
12a838d1f6
Merge "Make ActionDisabledByAdminDialog can adopt selected font" into rvc-dev
2020-04-20 06:39:46 +00:00
Bonian Chen
23ed0b2c34
[Settings] Avoid from EUICC access blocking main thread
...
Avoid from EUICC accessing form main thread and timeout if API takes too
much time.
Bug: 143996139
Test: manual
Change-Id: Ic1a2bd948b69d40632555d293df6ed56a6b7a712
2020-04-20 14:38:23 +08:00
Bonian Chen
d9dadc0511
Merge "[DataUsage] UX enhancement" into rvc-dev
2020-04-20 06:24:12 +00:00
Bonian Chen
a66cf69f1f
[DataUsage] UX enhancement
...
Some of the field didn't take eu languages into consideration.
Enhance it through changing the:
1. Format of display
2. Parser after user input
3. IME support for comma in eu language
Bug: 141536928
Test: Manual input and check for results
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=BillingCycleSettingsTest
Change-Id: Ia7afc88c9043e924f205f966c4091248261b0aee
2020-04-20 12:54:43 +08:00
TreeHugger Robot
0d54da879e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 517dfeb385
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I02b63a18f678d09f504f5c89266e3b99d48b5d42
2020-04-19 16:30:06 +00:00
TreeHugger Robot
517dfeb385
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-04-19 15:48:36 +00:00
Bonian Chen
8f67701294
[Settings] Support of DSDS API
...
Replacing getDataEnabled() by isDataEnabledForApn().
Bug: 143996139
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=BillingCycleSettingsTest
Change-Id: If36cfcd7c6b44fb89957ebf9f741936041761d9c
2020-04-19 21:19:18 +08:00
Bill Yi
1b87a5528c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I01bde29a6ada6179c207cf2f0f6bde1a8dbffceb
2020-04-19 01:38:42 -07:00
Bill Yi
12980747a1
[automerger skipped] Import translations. DO NOT MERGE am: f6f96f8a85
-s ours am: 90cce123e5
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Idb464788b9d8897e3263967235b85b809a3b333f
2020-04-19 08:24:02 +00:00
Bill Yi
90cce123e5
[automerger skipped] Import translations. DO NOT MERGE am: f6f96f8a85
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I3e5cce528fa6eccc7e7de29516b96e54cfddddb1
2020-04-19 08:05:02 +00:00
Bill Yi
f6f96f8a85
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ia460d84145b5e6f1ff7a4fb93ad34510ed1a6800
2020-04-18 22:28:22 -07:00
Julia Reynolds
9cbee26069
Update configure notifications screen am: f43cf08634
...
Change-Id: I1892d5d51bbf24ab2109e841c649a578de78500d
2020-04-17 20:59:37 +00:00
Julia Reynolds
cecc69512d
Update conversation bubble settings
...
Test: atest
Fixes: 153471239
Change-Id: If53571b17236e5f49a1750acc9816287f5de2b1a
2020-04-17 16:32:44 -04:00
Julia Reynolds
f43cf08634
Update configure notifications screen
...
Test: atest
Bug: 153150072
Change-Id: I99ebe2cad5036a154c40bce54dbd6ddbd23c2323
2020-04-17 12:47:06 -04:00
TreeHugger Robot
4deaf56720
Merge "Fix incorrect app count displayed under special app access" into rvc-dev am: 87883c7634
...
Change-Id: I8e9c0ce77944b57245ca25e3fe00bf427e061cd4
2020-04-17 10:19:04 +00:00