Alex Johnston
a8f1a69f3e
Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6
am: b2c004b3b7
am: 85404a89c2
am: 4c5218b503
...
Change-Id: I86bb6e9d8bc49954eae1ccdabb758e0ff8dcf0f4
2020-04-29 09:09:35 +00:00
Alex Johnston
d1408a66a6
Merge "Check if FRP policy is supported in Settings" into rvc-dev
2020-04-29 08:19:14 +00:00
Mady Mellor
b09f9f37aa
Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e
am: 0ffd6c0b17
am: e62939420e
am: fad77d3ffd
...
Change-Id: I47ec347fffc1a083e376c6bea445da3d2a9d4fa2
2020-04-28 23:11:38 +00:00
Mady Mellor
a27918494f
Add list of selected/excluded convos to bubble settings
...
* Some changes to extend AppConversationListPrefController
* When a user removes something from the selected or
excluded list that resets the channel setting
Bug: 148619540
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="Bubble"
Change-Id: I7a9ed7b70208dbdefca6c3c09d34d55c65f06408
2020-04-28 13:18:56 -07:00
Alex Johnston
05c0ab0324
Check if FRP policy is supported in Settings
...
* Check if FRP policy is supported before
erasing a device via settings.
* Call DPM TestAPI isFactoryResetProtectionPolicySupported
* If FRP policy is not supported, then do not
erase the device.
Bug: 155057616
Test: atest com.android.settings.MasterClearConfirmTest
Change-Id: I56e4a6566457f31932658188646abe21701637fc
2020-04-28 13:48:01 +01:00
Yanting Yang
69f5514c74
Merge "Remove sub-text from slice builder" into rvc-dev am: 38bd23cb7f
am: 70abedee86
am: 38a90b2090
am: 0ff67f4a59
...
Change-Id: If8f5b7acdb2f4948cee7bc8e07845565c63684f2
2020-04-28 09:12:38 +00:00
Yanting Yang
38bd23cb7f
Merge "Remove sub-text from slice builder" into rvc-dev
2020-04-28 07:48:45 +00:00
Jason Hsu
f6fc1154f3
Merge "Change the name of accessibility service fragment type to more descriptive names" into rvc-dev am: e0adf5bfd6
am: cb4587f098
am: 98c5ec6e58
am: 5c884a95a3
...
Change-Id: I81d5eccf9a3eb45df7958ab17b13ce7fe740e952
2020-04-28 06:51:20 +00:00
Yanting Yang
96127fe621
Remove sub-text from slice builder
...
We would like to remove all sub-text from Settings Search. But slice
view does not support API to configure the sub-text visibility.
Therefore, the only way is to remove the sub-text from slices directly.
Since Settings slices are also invoked by other apps, we can not
directly remove the sub-text.
Finally, we decide to check the caller's uid. If it comes from Settings
Search, we will return the slice without the sub-text.
Bug: 143118037
Test: visual, robotests
Change-Id: Iac72f1683a2c930592634e0599058890d86f669d
2020-04-28 14:15:16 +08:00
Jason Hsu
e0adf5bfd6
Merge "Change the name of accessibility service fragment type to more descriptive names" into rvc-dev
2020-04-28 05:55:58 +00:00
TreeHugger Robot
a9ba9c02a5
Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389
am: 7cf00c8a97
am: 6471bef55c
am: 0009d317fa
...
Change-Id: I99e80f51c027bc0239a008fa6b81df7ffb3d6c9a
2020-04-28 03:57:40 +00:00
TreeHugger Robot
6fcac1d389
Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev
2020-04-28 02:43:55 +00:00
jasonwshsu
43daeb90da
Change the name of accessibility service fragment type to more descriptive names
...
Bug: 155052371
Test: manual test
Change-Id: I097138c84083528acd4d16a145921227ffe3f736
2020-04-28 00:55:04 +08:00
kholoud mohamed
c5b78e072f
Fix broken tests in RedactionInterstitialTest
...
correctly set the user as managed profile after the
implementation for ShadowUserManager#isManagedProfile changed.
Fixes: 154567856
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.notification.RedactionInterstitialTest
Change-Id: I14472913391c3986c5f27391023e396b7b64aad3
2020-04-27 15:25:42 +01:00
TreeHugger Robot
9a7dec9993
Merge "Hide the "play media to" option" into rvc-dev am: 2152d0ce4f
am: 1580c35296
am: 8dc3937594
am: ce613552f9
...
Change-Id: Iad7becfb6836704b4228a51c1450bc7191c869cf
2020-04-27 10:47:25 +00:00
TreeHugger Robot
2152d0ce4f
Merge "Hide the "play media to" option" into rvc-dev
2020-04-27 09:55:56 +00:00
TreeHugger Robot
6c99ccd68a
Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872
am: 03f59415ce
am: 0de5e57557
am: cc24b800a1
...
Change-Id: Ib549b029529b673a93a92df8e33f9d78fcfff52e
2020-04-27 09:12:12 +00:00
TreeHugger Robot
2e16d78872
Merge "Dynamic grouping failed the first time" into rvc-dev
2020-04-27 08:35:48 +00:00
hughchen
d02c31e693
Hide the "play media to" option
...
This CL will hide the "play media to" option is there are no active
media session and media state is not playing.
Bug: 154457882
Test: manually test
Change-Id: If272a336f06b51e7a2e1605c8dc092b2ca134c25
2020-04-27 11:42:06 +08:00
Bonian Chen
af6cab97b3
Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev am: b9217e8e17
am: 7976cfc02d
am: 1e465439ad
am: 944506d7fa
...
Change-Id: I29e6089254883ea5543708ceb1481c2e40f6ae18
2020-04-25 05:50:14 +00:00
Bonian Chen
b9217e8e17
Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev
2020-04-25 04:54:04 +00:00
Robert Luo
5e3c02cba5
Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev am: 44121a7a3d
am: 44cc3810f3
am: e2a37cf952
am: 36cb9117b1
...
Change-Id: I6053788987e187db510b66f1c4c123f6a7785d16
2020-04-24 12:12:59 +00:00
Robert Luo
44121a7a3d
Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev
2020-04-24 11:24:30 +00:00
Robert Luo
b26b9561a1
Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems
...
Bug: 154561690
Test: make RunSettingsRoboTests and pass all test cases in NfcAndPaymentFragmentTest
Change-Id: I12f4901e4de01eb259f9daf3ac33b1e1879e98fd
2020-04-24 17:47:12 +08:00
TreeHugger Robot
628fb47526
Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf
am: 204c1bc8f5
am: 46917ef154
am: 12d2465c80
...
Change-Id: I414ad38d2393b995a564ac6539d07a9a1c20d3d3
2020-04-24 09:30:40 +00:00
TreeHugger Robot
0a98937baf
Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev
2020-04-24 08:32:55 +00:00
Tim Peng
c433a867b3
Dynamic grouping failed the first time
...
-Check if Worker is null
-Add test case
Bug: 154875482
Test: make -j50 RunSettingsRoboTests
Change-Id: I84572ef77cc9a48c3133d96fd2255754bc1cf67c
2020-04-24 07:45:24 +00:00
TreeHugger Robot
583682bab1
Merge "[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java." into rvc-dev am: a4590dc227
am: 1bb16670c6
am: 1292188a56
am: da8749304f
...
Change-Id: I4d9279221e199f136dcaf6a3bf4693aa5e512c8d
2020-04-24 07:26:24 +00:00
TreeHugger Robot
a4590dc227
Merge "[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java." into rvc-dev
2020-04-24 06:23:06 +00:00
govenliu
d59d32e106
[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java.
...
Add new unit test file WifiP2pSettingsTest.java.
Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest
Change-Id: I686658969a801e385a102022c6854d8bb8972d3c
2020-04-24 13:03:09 +08:00
Bonian Chen
c045542bc4
Merge "[Settings] Support the display of data usage when SIM inactive" into rvc-dev am: a26a7afe8e
am: bb30fbedcd
am: cbd37d7b85
am: a5e70283ba
...
Change-Id: I64d73426520964cf7cbdee7654de2471a04b20a3
2020-04-24 04:21:50 +00:00
Jason Hsu
d071e4e0e7
Merge "Use new setting key to maintain the list of user assigned shortcut targets." into rvc-dev am: 79d73eaa59
am: faa9c3b033
am: 4d2022a4d9
am: 2b47e35081
...
Change-Id: I78bc231cf66a0de45fbc0c5b31013e7b3c60f11a
2020-04-24 03:31:18 +00:00
Bonian Chen
a26a7afe8e
Merge "[Settings] Support the display of data usage when SIM inactive" into rvc-dev
2020-04-24 03:16:14 +00:00
Jason Hsu
79d73eaa59
Merge "Use new setting key to maintain the list of user assigned shortcut targets." into rvc-dev
2020-04-24 03:07:39 +00:00
Bonian Chen
76627e415d
[Settings] Fix DataUsageUtilsTest
...
Fix DataUsageUtilsTest
Bug: 154564365
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageUtilsTest
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageSummaryTest
Change-Id: Iff614135dfb0015deb5220fbf7f9338322def507
2020-04-24 10:46:30 +08:00
Bonian Chen
a941ba45a0
Merge "[Settings] Fix DataUsageSummaryTest" into rvc-dev am: 4908511b17
am: da77a404c0
am: d6471bfe2b
am: 83e46d3fda
...
Change-Id: I6da8a385e4573eeee51d567569462896ff94b3f8
2020-04-24 02:27:45 +00:00
Bonian Chen
4908511b17
Merge "[Settings] Fix DataUsageSummaryTest" into rvc-dev
2020-04-24 01:18:25 +00:00
Jason Chang
664c935738
Merge "Fixed One-Handed preference item’s second line should show on/off status in Settings > System > Gesture > One-Handed."
2020-04-24 00:52:53 +00:00
Fabian Kozynski
b229ffaac4
Merge "Add setting toggle for power menu privacy" into rvc-dev am: 7848696ea1
am: d1da33e594
am: fab7053e19
am: fb1285f927
...
Change-Id: Ib34c1637f590ab73627c7e6ff48ee9e11fb710d4
2020-04-23 20:51:11 +00:00
Fabian Kozynski
7848696ea1
Merge "Add setting toggle for power menu privacy" into rvc-dev
2020-04-23 19:38:05 +00:00
Brad Ebinger
54c8a3842b
Merge "Revise strings as per string UX review" into rvc-dev am: c3d052a48c
am: d73fd30545
am: a62927963a
am: 15801febee
...
Change-Id: I7029c358b769253c6cdd625b3d13c301b4f1602d
2020-04-23 16:43:26 +00:00
Jason Chang
8c42720803
Fixed One-Handed preference item’s second line should show on/off
...
status in Settings > System > Gesture > One-Handed.
To override getSummary() method to display on/off status in
One-Handed preference item’s second line.
Bug: 154600203
Test: manual
Change-Id: Ic9a5b74fbca041a08e712d5529b66e672f0c74ab
2020-04-23 23:54:05 +08:00
Brad Ebinger
c3d052a48c
Merge "Revise strings as per string UX review" into rvc-dev
2020-04-23 15:38:39 +00:00
PETER LIANG
516516f1e9
Merge changes from topic "tutorial_improvement" into rvc-dev am: b6bf10ebbc
am: 15d20efe43
am: 636d68059e
am: fbe9b33c73
...
Change-Id: I8711cc5c75a05d7865b22e411648debe3adda41e
2020-04-23 13:28:37 +00:00
Bonian Chen
1521d35635
Merge "[Settings] Fix CellDataPreferenceTest" into rvc-dev am: ef2e319347
am: ec80b6da3a
am: 9e63bd4867
am: 0de3ee1267
...
Change-Id: Id459a4b929774a7b08361686ac13ce7bbdc48924
2020-04-23 12:44:01 +00:00
PETER LIANG
b6bf10ebbc
Merge changes from topic "tutorial_improvement" into rvc-dev
...
* changes:
Tutorial improvement for Accessibility shortcut (3/n).
Tutorial improvement for Accessibility shortcut (2/n).
Tutorial improvement for Accessibility shortcut (1/n).
2020-04-23 12:37:15 +00:00
Bonian Chen
bc10c00149
[Settings] Support the display of data usage when SIM inactive
...
SIM can be inactive but remain existed within slot.
Therefore, change the design here.
Bug: 143996139
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
Change-Id: I24ec529b120b2801f7b9089b07d32bdd1038883f
2020-04-23 19:53:46 +08:00
Bonian Chen
29e37ceaa1
[Settings] Fix CellDataPreferenceTest
...
Fix CellDataPreferenceTest
Bug: 154562715
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=CellDataPreferenceTest
Change-Id: Ia0ee0f5cd802ca9b6827bddcaf189c619d268074
2020-04-23 17:51:14 +08:00
Bonian Chen
822a79efb8
Merge "[Settings] Move some work into background thread" into rvc-dev am: 7585e6ac1f
am: d68d156a80
am: 243ea793ce
am: 48a36f7af8
...
Change-Id: I88a745f929dafe080c1dd2b6d3624eb8684b11f4
2020-04-23 09:14:27 +00:00
Bonian Chen
7585e6ac1f
Merge "[Settings] Move some work into background thread" into rvc-dev
2020-04-23 08:22:32 +00:00