Julia Reynolds
68d3972a36
Merge "Remove unused development setting" into rvc-dev am: e2eb832033
am: 04b6152ef0
...
Change-Id: I14a3372d2ca7304667e3923b94d1a377eb927aa9
2020-04-29 15:52:56 +00:00
Julia Reynolds
90d41ad625
Fix bubble tests am: 99b363fb18
am: d4045296ba
...
Change-Id: I5eef62051373d7efbeb2b1bc63629f60edef931d
2020-04-29 15:52:44 +00:00
Julia Reynolds
e2eb832033
Merge "Remove unused development setting" into rvc-dev
2020-04-29 15:25:24 +00:00
Julia Reynolds
99b363fb18
Fix bubble tests
...
Test: atest
Fixes: 155239388
Change-Id: I8a32098b9a36ea1c8eabaf235b37d1e190419937
2020-04-29 13:58:46 +00:00
Alex Johnston
85404a89c2
Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6
am: b2c004b3b7
...
Change-Id: I35a73ed9051d360ab493968defcee656ca92f0c1
2020-04-29 08:49:52 +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
Julia Reynolds
6b2716fce0
Remove unused development setting
...
Test: atest
Fixes: 151821676
Change-Id: I59338340ac88873d20cd715c82723590af64acd3
2020-04-28 19:11:47 -04:00
Mady Mellor
e62939420e
Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e
am: 0ffd6c0b17
...
Change-Id: I9cea0ab8a2d0c1173e8bbd412a08065f9c18794d
2020-04-28 22:43:11 +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
38a90b2090
Merge "Remove sub-text from slice builder" into rvc-dev am: 38bd23cb7f
am: 70abedee86
...
Change-Id: I4004c82c62a78f8c329cdc8c74a8a17a4733c0bd
2020-04-28 08:45:00 +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
98c5ec6e58
Merge "Change the name of accessibility service fragment type to more descriptive names" into rvc-dev am: e0adf5bfd6
am: cb4587f098
...
Change-Id: I127aabddf277c184ac090920e89325755c98a46a
2020-04-28 06:24:37 +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
6471bef55c
Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389
am: 7cf00c8a97
...
Change-Id: I727061ec65629bf410aafdf953893ab0092e7db0
2020-04-28 03:19:03 +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
8dc3937594
Merge "Hide the "play media to" option" into rvc-dev am: 2152d0ce4f
am: 1580c35296
...
Change-Id: Iac86942ec17d36aa05ae73eeb920173629ae5e5c
2020-04-27 10:20:04 +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
0de5e57557
Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872
am: 03f59415ce
...
Change-Id: I525165fad42c5a32e57d3a644c95ae691db2e0d8
2020-04-27 08:51:16 +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
1e465439ad
Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev am: b9217e8e17
am: 7976cfc02d
...
Change-Id: Ia12ae46141f42366faed193e1bb344251a672290
2020-04-25 05:20:51 +00:00
Bonian Chen
b9217e8e17
Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev
2020-04-25 04:54:04 +00:00
Robert Luo
e2a37cf952
Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev am: 44121a7a3d
am: 44cc3810f3
...
Change-Id: Ia0b0c5bfc6d18d09f22f3bdae288287ea4b4285a
2020-04-24 11:51:19 +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
46917ef154
Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf
am: 204c1bc8f5
...
Change-Id: I18fd9c5bcfd70db343fb9ecd0eefda724f47c3b7
2020-04-24 08:56:46 +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
1292188a56
Merge "[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java." into rvc-dev am: a4590dc227
am: 1bb16670c6
...
Change-Id: Iecf8ef5d296089b5db46ca0d6beb1f6ed939cce1
2020-04-24 06:52:52 +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
cbd37d7b85
Merge "[Settings] Support the display of data usage when SIM inactive" into rvc-dev am: a26a7afe8e
am: bb30fbedcd
...
Change-Id: I4b57d56ee06bed635829b53d3558104e98a99b09
2020-04-24 03:47:33 +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
4d2022a4d9
Merge "Use new setting key to maintain the list of user assigned shortcut targets." into rvc-dev am: 79d73eaa59
am: faa9c3b033
...
Change-Id: I58a15bad18d310302ac02e4dd906feca738d8c24
2020-04-24 03:15:36 +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
da77a404c0
Merge "[Settings] Fix DataUsageSummaryTest" into rvc-dev am: 4908511b17
...
Change-Id: I888b0bd6b7f8280816046d31549d132091e6fa4e
2020-04-24 01:34:06 +00:00
Bonian Chen
4908511b17
Merge "[Settings] Fix DataUsageSummaryTest" into rvc-dev
2020-04-24 01:18:25 +00:00
Fabian Kozynski
d1da33e594
Merge "Add setting toggle for power menu privacy" into rvc-dev am: 7848696ea1
...
Change-Id: Ib35e6a047c147e2e6c743de3543423d92920f6c3
2020-04-23 19:54:20 +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
d73fd30545
Merge "Revise strings as per string UX review" into rvc-dev am: c3d052a48c
...
Change-Id: I26b56d053b1504a9061c765fe7504603f8394fe1
2020-04-23 15:57:03 +00: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
99d4e3210d
Merge changes from topic "tutorial_improvement" into rvc-dev am: b6bf10ebbc
...
Change-Id: Ie89050239048e7e6bc83a258b0e90547d87a7fb7
2020-04-23 12:48:25 +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
e02ffc7b7d
Merge "[Settings] Fix CellDataPreferenceTest" into rvc-dev am: ef2e319347
...
Change-Id: Iae36b68fa837883091f293d6f72577d02f6cc5ea
2020-04-23 12:06:37 +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