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
Pasty Chang
ea8fbd8375
Merge "Set the text of accessibility description in suw to center" into rvc-dev am: e060311358 am: 82995ab956 am: 07ad266aec am: a30fcca3b9
...
Change-Id: I222da68b67dbdf1827701d81c1997027a3247de0
2020-05-13 04:11:06 +00:00
Pasty Chang
5386ea1801
Merge "Set the text of accessibility description in suw to center" into rvc-dev am: e060311358 am: 12240e4d37 am: 2e0b7e4e8f am: 3ecf08fe08
...
Change-Id: I35716bf4052f919da207e17ce5c7669586c58100
2020-05-13 04:10:59 +00:00
Automerger Merge Worker
2868b8b2d7
[automerger skipped] Merge "Merge "Add setPackage for PendingIntent in SliceHelper" into rvc-dev am: 0c821c7be2 am: 27e950f857" into rvc-d1-dev-plus-aosp am: 5836d27fc9 -s ours am: 3b55067c32 -s ours
...
am skip reason: Change-Id I33c1333f9b5472cdb962b272f6be52a2d2959376 with SHA-1 0383d76a5e is in history
Change-Id: I7bfde70e26e86114e541577ad309741edd33bad1
2020-05-13 04:10:51 +00:00
Pasty Chang
4913adfe37
Merge "Set the text of accessibility description in suw to center" into rvc-dev am: e060311358 am: 12240e4d37 am: 640affe10e am: 4e8f1b4b2d
...
Change-Id: Ib269e88bc2776be326efe6a7ecdbb1856f3dabff
2020-05-13 04:10:42 +00:00
Betty Chang
843d0885d9
[automerger skipped] Merge "Add setPackage for PendingIntent in SliceHelper" into rvc-dev am: 0c821c7be2 am: 27e950f857 am: d9272e4223 am: b906213499 -s ours
...
am skip reason: Change-Id I33c1333f9b5472cdb962b272f6be52a2d2959376 with SHA-1 0383d76a5e is in history
Change-Id: I460ec2c5cd9a21e1163c1b461b6f473364429340
2020-05-13 04:10:27 +00:00
Betty Chang
7c5b0b0038
[automerger skipped] Merge "Add setPackage for PendingIntent in SliceHelper" into rvc-dev am: 0c821c7be2 am: f3740eec9d am: dc0a1ea53f am: cb2e8f3f4e -s ours
...
am skip reason: Change-Id I33c1333f9b5472cdb962b272f6be52a2d2959376 with SHA-1 e231e87e80 is in history
Change-Id: I2c1f4fb1ecdc072019099c07cbba875951245bd0
2020-05-13 04:10:02 +00:00
Edgar Wang
782438347b
Revert "Unable to select twilight scheduling after enabling location"
...
This reverts commit 9073b2f968 .
Bug: 153115261
Reason for revert: this CL make Settings robolectric test fail at com.android.settings.display.darkmode.DarkModeScheduleSelectorControllerTest
Change-Id: I3f1ba35f55f2905b10ca97149268be6074780eda
2020-05-13 03:58:36 +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
Pasty Chang
a30fcca3b9
Merge "Set the text of accessibility description in suw to center" into rvc-dev am: e060311358 am: 82995ab956 am: 07ad266aec
...
Change-Id: I64361f6bcfe7629a81cabde2c5e587dabba06c68
2020-05-13 03:39:45 +00:00
Pasty Chang
3ecf08fe08
Merge "Set the text of accessibility description in suw to center" into rvc-dev am: e060311358 am: 12240e4d37 am: 2e0b7e4e8f
...
Change-Id: I6efcde5cbe26a43bb30e42acefea5b4d18e94388
2020-05-13 03:39:38 +00:00
Automerger Merge Worker
3b55067c32
[automerger skipped] Merge "Merge "Add setPackage for PendingIntent in SliceHelper" into rvc-dev am: 0c821c7be2 am: 27e950f857" into rvc-d1-dev-plus-aosp am: 5836d27fc9 -s ours
...
am skip reason: Change-Id I33c1333f9b5472cdb962b272f6be52a2d2959376 with SHA-1 0383d76a5e is in history
Change-Id: Ie8ed710513b30a0bc94d5ca67ecda0ee3b8756e8
2020-05-13 03:39:32 +00:00
Pasty Chang
4e8f1b4b2d
Merge "Set the text of accessibility description in suw to center" into rvc-dev am: e060311358 am: 12240e4d37 am: 640affe10e
...
Change-Id: I2920812e5782a881685c45ec346bb8a08328118b
2020-05-13 03:39:27 +00:00
Betty Chang
b906213499
Merge "Add setPackage for PendingIntent in SliceHelper" into rvc-dev am: 0c821c7be2 am: 27e950f857 am: d9272e4223
...
Change-Id: I0f701261ef50f63d6b941c5c3f9880eb316c1e3a
2020-05-13 03:39:21 +00:00
Betty Chang
cb2e8f3f4e
Merge "Add setPackage for PendingIntent in SliceHelper" into rvc-dev am: 0c821c7be2 am: f3740eec9d am: dc0a1ea53f
...
Change-Id: Id17cb3f27f78ce9083f8912ee0e2f2196e4e46d4
2020-05-13 03:39:14 +00:00
Pasty Chang
07ad266aec
Merge "Set the text of accessibility description in suw to center" into rvc-dev am: e060311358 am: 82995ab956
...
Change-Id: If71c1fb27528ca757ee21a36dac7e05cfd835b47
2020-05-13 03:23:02 +00:00
Automerger Merge Worker
a7b489b701
Merge "Merge "Revert "Create QS media player setting"" into rvc-dev am: cd3cde6169 am: 42db36efbe am: ba670c95e8" into rvc-qpr-dev-plus-aosp am: cc6748ef0c
...
Change-Id: Ieae2af592fd1c36802ff5d754134c61a6c8069e3
2020-05-13 03:22:34 +00:00
Pasty Chang
2e0b7e4e8f
Merge "Set the text of accessibility description in suw to center" into rvc-dev am: e060311358 am: 12240e4d37
...
Change-Id: Ice24beb254cf2698e528f4c6c9713972d7a9c50f
2020-05-13 03:22:29 +00:00
Pasty Chang
640affe10e
Merge "Set the text of accessibility description in suw to center" into rvc-dev am: e060311358 am: 12240e4d37
...
Change-Id: I45fbf7cbbfae77c536b1cb583e159cc47da28961
2020-05-13 03:22:25 +00:00
TreeHugger Robot
74feafde36
Merge "Revert "Create QS media player setting"" into rvc-dev am: cd3cde6169 am: 8f50f01f8b am: 02c3704871 am: bf93beaefd
...
Change-Id: Iba31c6f523a1558f09b47b9996d2a475bad6fb27
2020-05-13 03:22:20 +00:00
Automerger Merge Worker
5836d27fc9
Merge "Merge "Add setPackage for PendingIntent in SliceHelper" into rvc-dev am: 0c821c7be2 am: 27e950f857" into rvc-d1-dev-plus-aosp
2020-05-13 03:22:17 +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
5e961e2638
Merge "Add setPackage for PendingIntent in SliceHelper" into rvc-dev am: 0c821c7be2 am: 27e950f857
...
Change-Id: I64d53618ca20661f3a1c0cbaee0cc86e74848f90
2020-05-13 03:22:07 +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
d9272e4223
Merge "Add setPackage for PendingIntent in SliceHelper" into rvc-dev am: 0c821c7be2 am: 27e950f857
...
Change-Id: I04fbf6ddf81f87a6a02fe10bddc3b0f66401c5ca
2020-05-13 03:22:02 +00:00
Pasty Chang
82995ab956
Merge "Set the text of accessibility description in suw to center" into rvc-dev am: e060311358
...
Change-Id: I3d24c66098c8c64dfde79e07d81d8bbb5963137c
2020-05-13 03:08:54 +00:00
Pasty Chang
12240e4d37
Merge "Set the text of accessibility description in suw to center" into rvc-dev am: e060311358
...
Change-Id: I3da31457482f0d0d0c85aa4eede76c71f680a028
2020-05-13 03:08:44 +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
Automerger Merge Worker
cc6748ef0c
Merge "Merge "Revert "Create QS media player setting"" into rvc-dev am: cd3cde6169 am: 42db36efbe am: ba670c95e8" into rvc-qpr-dev-plus-aosp
2020-05-13 03:08:31 +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
828f2832ec
Merge "Revert "Create QS media player setting"" into rvc-dev am: cd3cde6169 am: 42db36efbe am: ba670c95e8
...
Change-Id: I1095a8eb78d224cf9e3ff8478448005540366e26
2020-05-13 03:08:27 +00:00
TreeHugger Robot
bf93beaefd
Merge "Revert "Create QS media player setting"" into rvc-dev am: cd3cde6169 am: 8f50f01f8b am: 02c3704871
...
Change-Id: Id4b92d7b8fe489b7c6708ad9f69d8ae741bd7466
2020-05-13 03:08:23 +00:00
TreeHugger Robot
eddfbfbf79
Merge "Revert "Create QS media player setting"" into rvc-dev am: cd3cde6169 am: 8f50f01f8b am: 811d4df610
...
Change-Id: I0cc0b992e5236ec566ecb570f2b498eeebee198d
2020-05-13 03:08:13 +00:00
Pasty Chang
e060311358
Merge "Set the text of accessibility description in suw to center" into rvc-dev
2020-05-13 03:03:50 +00:00
TreeHugger Robot
ba670c95e8
Merge "Revert "Create QS media player setting"" into rvc-dev am: cd3cde6169 am: 42db36efbe
...
Change-Id: I667c072d3d571c4af7d8f0befd6c9a99f3efcfae
2020-05-13 02:56:06 +00:00
Sunny Shao
d6d8f98844
Allows to launch only authenticator owned activities
...
- 3rd party developers can define himself-authenticator
and use the accountPreferences attribute to load the
predefined preference UI.
- If a developer defines an action intent to launch the
other activity in xml and it would return true due
to the true exported attribute and no permission.
- To avoid launching arbitrary activity. Here allows
to launch only authenticator owned activities.
Bug: 150946634
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.accounts
Test: PoC app
Change-Id: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
2020-05-13 10:55:49 +08:00
TreeHugger Robot
02c3704871
Merge "Revert "Create QS media player setting"" into rvc-dev am: cd3cde6169 am: 8f50f01f8b
...
Change-Id: I5bf642a99fc8ed02fd771c35fc3ebb61ae1ba1bd
2020-05-13 02:55:43 +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
TreeHugger Robot
d2b7e448b6
Merge "Remove the xml for bubble pref in developer options" into rvc-dev am: 60920beb86 am: ecb721e343 am: 39cac1f86a am: f97470a6fb
...
Change-Id: I3bca8508e6c72524710c4ed8584ab9d6ca930b38
2020-05-12 23:19:33 +00:00
Jason Hsu
d52c713834
Merge "Fix the issue that title of Color inversion page is wrong" into rvc-dev am: 394f925729 am: 9beb837352 am: 623c3feffe am: 72cc358db5
...
Change-Id: Id0164a57223ea5fa9970b96510d702f80349cad9
2020-05-12 23:17:58 +00:00
Jay Aliomer
9a0fbc3aab
Merge "Unable to select twilight scheduling after enabling location" into rvc-dev am: a5e7d180f1 am: 09312d8e70 am: 6f85a575aa am: 6555edd9ee
...
Change-Id: I673d0d9386f55fa0b90cee563aa420e508422feb
2020-05-12 23:17:22 +00:00
Kholoud Mohamed
6f18ace0ba
Merge "String changes in the cross profile settings page" into rvc-dev am: 311ff0c1ea am: c60cf0bc3e am: 87eddfe807 am: 80049a0b78
...
Change-Id: I8674863b4d2187dd64501e1a17bf17c24af77947
2020-05-12 23:16:37 +00:00
TreeHugger Robot
11351b2fc2
Merge "Fix broken test cases" into rvc-dev am: defd64c797 am: f6d924b9dd am: 1ad4898230 am: a23259cbf7
...
Change-Id: Icf9670d8e0d02c984193889186798ae2c3dd8f00
2020-05-12 23:15:48 +00:00
PETER LIANG
697a5e91b4
Merge "Add the settings content observer for shortcut preference." into rvc-dev am: a85f5dc80b am: e65f7a776d am: 03b27c3278 am: 25e665eb73
...
Change-Id: Ia4d5f67ebb14b8c0f3e987f1dc76299a1a789665
2020-05-12 23:14:41 +00:00