Commit Graph

61273 Commits

Author SHA1 Message Date
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
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
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
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
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
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
db0a05c926 Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: 8ca377ffd4
Change-Id: I62475cd44c69f04227a3e5e56de343fef675242c
2020-04-20 19:49:05 +00:00
Xiangyu/Malcolm Chen
8ca377ffd4 Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5
Change-Id: Ia9defd6ddcc917f333568fef33f093eb024e6eb2
2020-04-20 19:27:12 +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
Julia Reynolds
2ae4ad8242 Merge "Set explicit back target for history" into rvc-dev am: bb979153ed am: 4fa251613e am: d1cd33c72b
Change-Id: If0058e1c3c25bb1da0b41cd5fd2b8531dc444495
2020-04-20 18:27:57 +00:00
Julia Reynolds
d1cd33c72b Merge "Set explicit back target for history" into rvc-dev am: bb979153ed am: 4fa251613e
Change-Id: Iaf430693d977ba185c5241558d444bb581227196
2020-04-20 18:13:07 +00:00
Julia Reynolds
4fa251613e Merge "Set explicit back target for history" into rvc-dev am: bb979153ed
Change-Id: I2c81ca3114f44cab401b7f698cde7ae5481b8ebb
2020-04-20 17:53:22 +00:00
Julia Reynolds
bb979153ed Merge "Set explicit back target for history" into rvc-dev 2020-04-20 17:40:18 +00:00
jasonwshsu
cfda3179a6 Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 am: e7766cc455 am: 67dea59aeb
Change-Id: I1436f461c510965b401b8e221af6fb0a22e08cda
2020-04-20 17:28:46 +00:00
jasonwshsu
67dea59aeb Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 am: e7766cc455
Change-Id: Ie414f5b0ea32101371327845853c330eb297e12c
2020-04-20 17:03:31 +00:00
jasonwshsu
e7766cc455 Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11
Change-Id: I711b86a69ef33f24fa8dc1e175e3cb8c6741532b
2020-04-20 16:43:22 +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
59c64fefc0 Merge "Update conversation bubble settings" into rvc-dev am: 608bd69328 am: a8bb57287c am: 181a657080
Change-Id: I43558ed8a9ca4c2a21112bdc762807c9b992e64f
2020-04-20 14:26:58 +00:00
Julia Reynolds
181a657080 Merge "Update conversation bubble settings" into rvc-dev am: 608bd69328 am: a8bb57287c
Change-Id: I507228b6d30c8dfb5052a1190f7e803cc9301d72
2020-04-20 14:03:59 +00:00
Julia Reynolds
a8bb57287c Merge "Update conversation bubble settings" into rvc-dev am: 608bd69328
Change-Id: Id6c256f18943631a727b212d39b102c93f1a0f63
2020-04-20 13:37:30 +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
fa5fc6e7c8 Merge "Make ActionDisabledByAdminDialog can adopt selected font" into rvc-dev am: 12a838d1f6 am: 0199de663e am: 2729e0fa4f
Change-Id: Idec81561fed2bd0c9e5540e2e5ffcaf89def1887
2020-04-20 07:20:28 +00:00
Bonian Chen
da9861f7ab Merge "[DataUsage] UX enhancement" into rvc-dev am: d9dadc0511 am: 6457a087c3 am: 2600816357
Change-Id: Ibf26d84a2d97a3178d65075639db3c0a80f90783
2020-04-20 07:20:16 +00:00
TreeHugger Robot
2729e0fa4f Merge "Make ActionDisabledByAdminDialog can adopt selected font" into rvc-dev am: 12a838d1f6 am: 0199de663e
Change-Id: Iadc581a630249b0a65d1bfc49c72cef29fec3b9b
2020-04-20 07:03:00 +00:00
Bonian Chen
2600816357 Merge "[DataUsage] UX enhancement" into rvc-dev am: d9dadc0511 am: 6457a087c3
Change-Id: I33ba45bcc56d5ca016d6138ef3c9ea5b399fd1b2
2020-04-20 07:02:47 +00:00
TreeHugger Robot
0199de663e Merge "Make ActionDisabledByAdminDialog can adopt selected font" into rvc-dev am: 12a838d1f6
Change-Id: I0e5c668b2b7f3e59eaf1c0c9634c364a145bb0c6
2020-04-20 06:40:07 +00:00
Bonian Chen
6457a087c3 Merge "[DataUsage] UX enhancement" into rvc-dev am: d9dadc0511
Change-Id: I4a89a7a2075d723a8e70ed298b900546397239d5
2020-04-20 06:39:57 +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
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
0af5bc2a6a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 517dfeb385 -s ours am: a1dd01f5c3 -s ours am: d37783a7ac -s ours
am skip reason: subject contains skip directive

Change-Id: I84e509f236d3ea7b26a6014ec3b911314810f438
2020-04-19 17:06:43 +00:00
TreeHugger Robot
d37783a7ac [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 517dfeb385 -s ours am: a1dd01f5c3 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia9d2b6c706a79da6a2a2772137b50ca0ccd1a720
2020-04-19 16:53:40 +00:00
TreeHugger Robot
a1dd01f5c3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 517dfeb385 -s ours
am skip reason: subject contains skip directive

Change-Id: I4bdcdfb0126c7ca79e7726bd70db546537133763
2020-04-19 16:28:45 +00:00
TreeHugger Robot
517dfeb385 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-19 15:48:36 +00:00
Bill Yi
4437f7dc4b [automerger skipped] Import translations. DO NOT MERGE am: f6f96f8a85 -s ours am: 90cce123e5 -s ours am: 935ff6a18a -s ours am: b0ee01b3ab -s ours
am skip reason: subject contains skip directive

Change-Id: Ib3b50ea9b089ebc045c4048978015b215359f0e5
2020-04-19 09:05:20 +00:00
Bill Yi
b0ee01b3ab [automerger skipped] Import translations. DO NOT MERGE am: f6f96f8a85 -s ours am: 90cce123e5 -s ours am: 935ff6a18a -s ours
am skip reason: subject contains skip directive

Change-Id: Ie466022993d60576aa4371dc96240cd2d44eac61
2020-04-19 08:48:38 +00: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
935ff6a18a [automerger skipped] Import translations. DO NOT MERGE am: f6f96f8a85 -s ours am: 90cce123e5 -s ours
am skip reason: subject contains skip directive

Change-Id: I2ca017ad434243993b9ac12f0b3be09789374b69
2020-04-19 08:22:40 +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
708bc1c530 Update configure notifications screen am: f43cf08634 am: b84e194474 am: c1235654ef
Change-Id: I94467b851985d6fe74cafe2f3f76fb83a9fef887
2020-04-17 21:51:00 +00:00
Julia Reynolds
c1235654ef Update configure notifications screen am: f43cf08634 am: b84e194474
Change-Id: Iceef427af06d9faa17737801fb5ab0274716fcc4
2020-04-17 21:19:13 +00:00
Julia Reynolds
b84e194474 Update configure notifications screen am: f43cf08634
Change-Id: Idc63949ef2f2ecaaae7891a01d6eb48cbf830eaa
2020-04-17 20:58:04 +00:00
Julia Reynolds
cecc69512d Update conversation bubble settings
Test: atest
Fixes: 153471239
Change-Id: If53571b17236e5f49a1750acc9816287f5de2b1a
2020-04-17 16:32:44 -04:00