Commit Graph

11498 Commits

Author SHA1 Message Date
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
TreeHugger Robot
beacdf9774 Merge "[Wi-Fi] Add IMSI privacy protection warning summary" into rvc-dev am: 0a98937baf
Change-Id: Idb79edf5ef01ab33bcbd6625279f2eb21cd44c68
2020-04-24 08:40:06 +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
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
ab43d59d5d Merge "[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java." into rvc-dev am: a4590dc227
Change-Id: I959183b22cb6b33a8f2ae9f28d2c6130c47447df
2020-04-24 06:41:28 +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
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
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
9a283d43c5 Merge "[Settings] Support the display of data usage when SIM inactive" into rvc-dev am: a26a7afe8e
Change-Id: Ia456660917ae589ec162804d8e582ae2ce5100b5
2020-04-24 03:28:47 +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
2dc9e9ad76 Merge "Use new setting key to maintain the list of user assigned shortcut targets." into rvc-dev am: 79d73eaa59
Change-Id: I519d11ebd2ae4e7a29b62c7b93338f50ee28a9b0
2020-04-24 03:10:06 +00:00