Commit Graph

32705 Commits

Author SHA1 Message Date
TreeHugger Robot
3068fefc41 Merge "Revert "Add the settings content observer for shortcut preference."" into rvc-dev am: 9ae5b47aee am: 546c130e8d am: f37eaffefc am: aaf5e96718
Change-Id: I24e5a98e21353250b54e56ef3fe4dd62928b3b5e
2020-05-13 06:12:47 +00:00
TreeHugger Robot
aaf5e96718 Merge "Revert "Add the settings content observer for shortcut preference."" into rvc-dev am: 9ae5b47aee am: 546c130e8d am: f37eaffefc
Change-Id: I06d926566b7c359df0155ef1af594a1559feb4f1
2020-05-13 06:00:05 +00:00
TreeHugger Robot
1a3059c01a Merge "[Wi-Fi] Quit worker thread of WifiPickerTracker" into rvc-dev am: 02b7b16c93 am: 9fc28c5a7f am: 6cb294d26d am: d739d688b0
Change-Id: Iaee7c93686077fc0236a8c43bc34ef5f16638324
2020-05-13 05:29:33 +00:00
TreeHugger Robot
546c130e8d Merge "Revert "Add the settings content observer for shortcut preference."" into rvc-dev am: 9ae5b47aee
Change-Id: Id85a24305016ce9a3fda8b455cdec9f7441553c3
2020-05-13 05:20:24 +00:00
TreeHugger Robot
9ae5b47aee Merge "Revert "Add the settings content observer for shortcut preference."" into rvc-dev 2020-05-13 05:05:08 +00:00
TreeHugger Robot
6cb294d26d Merge "[Wi-Fi] Quit worker thread of WifiPickerTracker" into rvc-dev am: 02b7b16c93 am: 9fc28c5a7f
Change-Id: I99aedb7f8fac3adf3822098a519a9f157078edc6
2020-05-13 04:57:00 +00:00
TreeHugger Robot
9fc28c5a7f Merge "[Wi-Fi] Quit worker thread of WifiPickerTracker" into rvc-dev am: 02b7b16c93
Change-Id: I8a1d93bb01c0aa739798a0be709f660c1f6e5da1
2020-05-13 04:36:26 +00:00
TreeHugger Robot
02b7b16c93 Merge "[Wi-Fi] Quit worker thread of WifiPickerTracker" into rvc-dev 2020-05-13 04:18:18 +00:00
Edgar Wang
7e70ef64d4 Revert "Add the settings content observer for shortcut preference."
This reverts commit 785af0c15a.

Bug: 155837154

Reason for revert: robolectric test fail at com.android.settings.accessibility.ToggleFeaturePreferenceFragmentTest

Change-Id: If8e5681b044171ad6941307489526cc3834f66b2
2020-05-13 03:45:39 +00:00
TreeHugger Robot
a2b7973714 Merge "Revert "Create QS media player setting"" into rvc-dev am: cd3cde6169 am: 8f50f01f8b am: 811d4df610 am: eddfbfbf79
Change-Id: I40cbed0a3e2816c8c89b51a901a39c749a043ba0
2020-05-13 03:22:09 +00:00
Betty Chang
dc0a1ea53f Merge "Add setPackage for PendingIntent in SliceHelper" into rvc-dev am: 0c821c7be2 am: f3740eec9d
Change-Id: Ic27920596113d75258e016f545067cdbec791750
2020-05-13 03:22:05 +00:00
Betty Chang
f3740eec9d Merge "Add setPackage for PendingIntent in SliceHelper" into rvc-dev am: 0c821c7be2
Change-Id: I424c94eaa29752aa6bf54dd9a9c3356a0f54b05e
2020-05-13 03:08:40 +00:00
Betty Chang
27e950f857 Merge "Add setPackage for PendingIntent in SliceHelper" into rvc-dev am: 0c821c7be2
Change-Id: If0506f4bc29023e8109b20432584a55a879b7b33
2020-05-13 03:08:31 +00:00
TreeHugger Robot
811d4df610 Merge "Revert "Create QS media player setting"" into rvc-dev am: cd3cde6169 am: 8f50f01f8b
Change-Id: I51c914e778b82ab447823f65d880d9864008310c
2020-05-13 02:55:33 +00:00
Betty Chang
0c821c7be2 Merge "Add setPackage for PendingIntent in SliceHelper" into rvc-dev 2020-05-13 02:53:40 +00:00
TreeHugger Robot
42db36efbe Merge "Revert "Create QS media player setting"" into rvc-dev am: cd3cde6169
Change-Id: I20725949d542dd02b269ac84c12b691fa6e3679d
2020-05-13 02:37:47 +00:00
TreeHugger Robot
8f50f01f8b Merge "Revert "Create QS media player setting"" into rvc-dev am: cd3cde6169
Change-Id: Ib8c1bb043eae6c51671dec709fe3fe8ecd96641c
2020-05-13 02:37:41 +00:00
Arc Wang
a52782bc06 [Wi-Fi] Quit worker thread of WifiPickerTracker
Should quit worker thread when a fragment is about to
be destroyed.

Bug: 152454787
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest
Change-Id: I809511b7f7c092cf9787e8f6bb7c7513c27c98c8
2020-05-13 10:34:51 +08:00
TreeHugger Robot
cd3cde6169 Merge "Revert "Create QS media player setting"" into rvc-dev 2020-05-13 02:20:05 +00:00
Jason Hsu
9beb837352 Merge "Fix the issue that title of Color inversion page is wrong" into rvc-dev am: 394f925729
Change-Id: Ic7f5a3f816bf47316386a60a0c112dad4b5dedd3
2020-05-12 20:46:26 +00:00
Jay Aliomer
09312d8e70 Merge "Unable to select twilight scheduling after enabling location" into rvc-dev am: a5e7d180f1
Change-Id: I602e493dccc708e9fbd919e94e8c4201bf141dbd
2020-05-12 20:46:04 +00:00
Kholoud Mohamed
c60cf0bc3e Merge "String changes in the cross profile settings page" into rvc-dev am: 311ff0c1ea
Change-Id: I578ee55ae704365805c9b370973076e8b78abf6d
2020-05-12 20:45:49 +00:00
PETER LIANG
e65f7a776d Merge "Add the settings content observer for shortcut preference." into rvc-dev am: a85f5dc80b
Change-Id: Id556df579ea8502b6e9e788e561640884da1dd13
2020-05-12 20:43:56 +00:00
Nate Myren
34bb53e29c Merge "Add Auto Revoke log to the App Info page" into rvc-dev am: 0c6037af5f
Change-Id: Id31df5ef00422f26511709be6e10d233521505f8
2020-05-12 19:22:12 +00:00
PETER LIANG
818eda8a79 Merge "Fix that the inconsistent accessibility content pages under Setup Wizard." into rvc-dev am: 7a31f2da60
Change-Id: I0e81255f25a331c152fe23cdf3689f49cc7c632e
2020-05-12 19:21:57 +00:00
tim peng
630b918be0 Merge "Update "Play media to" in Sound Settings" into rvc-dev am: 72948ab538
Change-Id: Ibc609b88fb73c8a5edc3b36b357d96132f53b265
2020-05-12 19:21:52 +00:00
Jason Hsu
03b2025b1d Merge "Change to use ComponentName instead of String in log." into rvc-dev am: 7af9c771bd
Change-Id: Ic718cfd830486b1c95251aa2d0cfed1258caa120
2020-05-12 19:21:30 +00:00
Mehdi Alizadeh
8d370b78d8 Merge "Hides gesture nav settings page from search, when not available" into rvc-dev am: bddb0eb3dd
Change-Id: I9cd88e615dad229948e6eaad56d3f6018faffa6d
2020-05-12 19:21:17 +00:00
Jason Hsu
c5a930af64 Merge "Fix the issue that title of Color inversion page is wrong" into rvc-dev am: 394f925729 am: bea0e029a4 am: 6a9fe5c9a5 am: 08a5acc608
Change-Id: Ia0cfff2a45c00fa7d9d14edbe3c38888d4e463db
2020-05-12 19:14:40 +00:00
Kweku Adams
414fe0f9bc Merge "Hide RESTRICTED bucket from list when off." into rvc-dev am: 71c78ed42b
Change-Id: I90fc1ddbdcdc2b47b480fa2dda0bd2d3db382363
2020-05-12 19:01:11 +00:00
TreeHugger Robot
a02f199843 Merge "Add low battery level for case" into rvc-dev am: 83cc03d0b1
Change-Id: I05eb85b4649605fe2892e833819d9ad488719691
2020-05-12 18:59:56 +00:00
Tsung-Mao Fang
1b87002e09 Merge "Talkback speaks "work" for work profile app" into rvc-dev am: 32e693d657
Change-Id: Id155986ac5faf7e579f6abaa9200e461c8b828ef
2020-05-12 18:55:07 +00:00
Jason Hsu
6a9fe5c9a5 Merge "Fix the issue that title of Color inversion page is wrong" into rvc-dev am: 394f925729 am: bea0e029a4
Change-Id: I69b295453c5c1777286fd7fba0ae19f85dafdf1b
2020-05-12 18:41:01 +00:00
Jason Hsu
bea0e029a4 Merge "Fix the issue that title of Color inversion page is wrong" into rvc-dev am: 394f925729
Change-Id: Ie3757bf068ea020339518dcb8fa60b003e34db09
2020-05-12 18:24:51 +00:00
Jason Hsu
394f925729 Merge "Fix the issue that title of Color inversion page is wrong" into rvc-dev 2020-05-12 18:04:49 +00:00
Lucas Dupin
d207f1baee Revert "Create QS media player setting"
This reverts commit 665c36eae2.

Reason for revert: New media experience landed
Fixes: 156369996

Change-Id: Icb997a3508cec1e15f523b8ca5b923deacee66b4
2020-05-12 16:51:06 +00:00
Jay Aliomer
a6a005e89b Merge "Unable to select twilight scheduling after enabling location" into rvc-dev am: a5e7d180f1 am: 39065aece9 am: 4760edc65c am: 1a2353fcf4
Change-Id: I56a21077964c3c472f37b7e6707562cd3b36d44d
2020-05-12 16:35:47 +00:00
Kholoud Mohamed
65c5f7e285 Merge "String changes in the cross profile settings page" into rvc-dev am: 311ff0c1ea am: d3bd08653d am: d8688acfd9 am: 391db760a0
Change-Id: I41da9424f9ccc037b0be4e176358ec0d0e6a87af
2020-05-12 16:15:11 +00:00
Jay Aliomer
4760edc65c Merge "Unable to select twilight scheduling after enabling location" into rvc-dev am: a5e7d180f1 am: 39065aece9
Change-Id: I087637946cb50c4dbf5ec37fb20a4129691ffe37
2020-05-12 16:10:01 +00:00
Jay Aliomer
39065aece9 Merge "Unable to select twilight scheduling after enabling location" into rvc-dev am: a5e7d180f1
Change-Id: I84b08fc46ba0e41ce076e49b46f38a7d64121584
2020-05-12 15:58:06 +00:00
Kholoud Mohamed
d8688acfd9 Merge "String changes in the cross profile settings page" into rvc-dev am: 311ff0c1ea am: d3bd08653d
Change-Id: I81a3622d9e8ce812f958eff544f833b0097fecac
2020-05-12 15:43:16 +00:00
Jay Aliomer
a5e7d180f1 Merge "Unable to select twilight scheduling after enabling location" into rvc-dev 2020-05-12 15:42:49 +00:00
jasonwshsu
112cd4d6d1 Fix the issue that title of Color inversion page is wrong
* Title need to be set from getPreferenceScreenResId(), recover the xml file.

Bug: 156201719
Test: manual test
Change-Id: Ib8b79c320c6a48b1dd679738ddc7022ccaeaed86
2020-05-12 23:35:11 +08:00
Kholoud Mohamed
d3bd08653d Merge "String changes in the cross profile settings page" into rvc-dev am: 311ff0c1ea
Change-Id: Ic44752f686a0878ab05e8ccf7a2e4190fa153b26
2020-05-12 15:29:49 +00:00
Kholoud Mohamed
311ff0c1ea Merge "String changes in the cross profile settings page" into rvc-dev 2020-05-12 15:13:32 +00:00
PETER LIANG
5cca393b3b Merge "Add the settings content observer for shortcut preference." into rvc-dev am: a85f5dc80b am: 99f1a37582 am: a0953560f8 am: 7fcf167362
Change-Id: I7df7b79bc75d61130bf45bdf3763c10d8933115f
2020-05-12 12:34:47 +00:00
PETER LIANG
a0953560f8 Merge "Add the settings content observer for shortcut preference." into rvc-dev am: a85f5dc80b am: 99f1a37582
Change-Id: I87fbd8dbf03219c5e56ff2ac9a1e0afb566b4e82
2020-05-12 11:56:08 +00:00
PETER LIANG
99f1a37582 Merge "Add the settings content observer for shortcut preference." into rvc-dev am: a85f5dc80b
Change-Id: Ib3e57d67fd4870356ef672ee0d60489842b3e673
2020-05-12 11:42:56 +00:00
PETER LIANG
a85f5dc80b Merge "Add the settings content observer for shortcut preference." into rvc-dev 2020-05-12 11:29:11 +00:00
changbetty
0383d76a5e Add setPackage for PendingIntent in SliceHelper
Bug: 151645867
Bug: 151646375
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingSliceHelperTest
      make RunSettingsRoboTests ROBOTEST_FILTER=Enhanced4gLteSliceHelperTest
Change-Id: I33c1333f9b5472cdb962b272f6be52a2d2959376
Merged-In: I33c1333f9b5472cdb962b272f6be52a2d2959376
2020-05-12 17:56:48 +08:00