Commit Graph

11613 Commits

Author SHA1 Message Date
Julia Reynolds
99b363fb18 Fix bubble tests
Test: atest
Fixes: 155239388
Change-Id: I8a32098b9a36ea1c8eabaf235b37d1e190419937
2020-04-29 13:58:46 +00:00
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
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
20555b3e39 Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6
Change-Id: Ia730a919a16bb89f4d4543bc5cd592885ff730fd
2020-04-29 08:34:00 +00:00
Jason Chiu
d304c20a15 Refine contextual Bluetooth card behavior when Bluetooth is off
When bluetooth is off, show the specific layout for enabling Bluetooth.

Bug: 154691520
Test: robotest
Change-Id: If3fd493558dcf2a47183345bbe175dfe257574d1
2020-04-29 16:29:41 +08:00
Alex Johnston
d1408a66a6 Merge "Check if FRP policy is supported in Settings" into rvc-dev 2020-04-29 08:19:14 +00:00
Blake Kragten
b0962e5dda Remove enhanced connectivity switch for non-pixel
Bug: 155027331
Test: using aosp build
Change-Id: Ifbb3a29515e60b592e91005459c27084ee3730c3
2020-04-28 16:30:52 -07: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
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
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
ec9e965d90 Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e
Change-Id: I382f080699006d2a3d160290f7b71d84cd65f033
2020-04-28 22:30:18 +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
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
f3354ea59c Merge "Remove sub-text from slice builder" into rvc-dev am: 38bd23cb7f
Change-Id: I9703a63418d231dedef72a332286fac6af86b648
2020-04-28 08:25:33 +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
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
38e6e6451f Merge "Change the name of accessibility service fragment type to more descriptive names" into rvc-dev am: e0adf5bfd6
Change-Id: I15d4d21de6d298505b49211aa3c814a4be4762ca
2020-04-28 06:10:11 +00: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
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
4667f60fd6 Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389
Change-Id: I62a3fc49e67fadc1ffa8aafee445ecfdf7e7e373
2020-04-28 03:03:31 +00:00
TreeHugger Robot
6fcac1d389 Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev 2020-04-28 02:43:55 +00:00
Malcolm Chen
97a8568e49 Fix Robo test failure in NrDisabledInDsdsFooterPreferenceControllerTest.
Bug: 154566065
Test: robotest
Change-Id: I77dfa6eb61ee7b2cf2eb4fd8d8a392a43f7035b3
Merged-In: I77dfa6eb61ee7b2cf2eb4fd8d8a392a43f7035b3
2020-04-27 18:19:44 -07:00
Brad Ebinger
c973423a34 Revise strings as per string UX review
Fixes: 154148793
Fixes: 155098265
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Merged-In: Ia510ce5262fbe576718b0785175c0a82acb3c722
Change-Id: Ia510ce5262fbe576718b0785175c0a82acb3c722
2020-04-27 18:00:29 -07: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
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
4dc3280bd8 Merge "Hide the "play media to" option" into rvc-dev am: 2152d0ce4f
Change-Id: I653f6f990d6bde8b6cc1187486cecb73560d34ec
2020-04-27 10:07:55 +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
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
a7183d4323 Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872
Change-Id: I44d7a0b8dc13bf158129925d2f8e039a27702cdc
2020-04-27 08:38:46 +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
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
a261865632 Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev am: b9217e8e17
Change-Id: If8d10cc456874cb1772ce51aacf624b1467f47f2
2020-04-25 05:06:50 +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
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
5a5c7266c8 Merge "Fix broken NfcAndPaymentFragment test case - searchIndexProvider_shouldIndexAllItems" into rvc-dev am: 44121a7a3d
Change-Id: I1a26e35e643e1307b37f543fd80f238e94654b79
2020-04-24 11:41:37 +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
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