PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
69,683 Commits 1 Branch 0 Tags
bc92d48d3fd3aaf20f2debe973c5c83e7194a2dd
Commit Graph

69683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
e9a5de28af Merge "Allows to launch only authenticator owned activities" into rvc-dev am: dfb3f561ea 
Change-Id: I5b863704ab34128ed2bbffe22494198584881812
 2020-05-13 05:29:20 +00:00
TreeHugger Robot
991229fe6b Merge "Allows to launch only authenticator owned activities" into rvc-dev am: dfb3f561ea 
Change-Id: I53a707f8ca9a2c8f0b416254ae205c38d25e07e4
 2020-05-13 05:29:20 +00:00
TreeHugger Robot
dfb3f561ea Merge "Allows to launch only authenticator owned activities" into rvc-dev 2020-05-13 05:26:25 +00:00
TreeHugger Robot
ada7e82b72 Merge "Revert "Unable to select twilight scheduling after enabling location"" into rvc-dev am: 6d2ad68e1a 
Change-Id: I4462a5c69184c5623527c095b98bf7845989bcdb
 2020-05-13 05:20:43 +00:00
TreeHugger Robot
bfa9b3e6dc Merge "Revert "Unable to select twilight scheduling after enabling location"" into rvc-dev am: 6d2ad68e1a 
Change-Id: I299ecbfb577fd672e929de8c604e8af288e22341
 2020-05-13 05:20:37 +00:00
TreeHugger Robot
b726331702 Merge "Revert "Add the settings content observer for shortcut preference."" into rvc-dev am: 9ae5b47aee 
Change-Id: I3804e1de067a494a22623ad2f56dbffc985d5986
 2020-05-13 05:20:28 +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
6d2ad68e1a Merge "Revert "Unable to select twilight scheduling after enabling location"" into rvc-dev 2020-05-13 05:16:51 +00:00
Automerger Merge Worker
244b321947 Merge "Merge "[Wi-Fi] Quit worker thread of WifiPickerTracker" into rvc-dev am: 02b7b16c93 am: 3a92145c27 am: ca174c2f83" into rvc-qpr-dev-plus-aosp 2020-05-13 05:14:27 +00:00
TreeHugger Robot
b168f04466 Merge "[Wi-Fi] Quit worker thread of WifiPickerTracker" into rvc-dev am: 02b7b16c93 am: 3a92145c27 am: ca174c2f83 
Change-Id: Ibbebbfc477c5bf18b4235022de702c38e5d1fdb5
 2020-05-13 05:14:22 +00:00
TreeHugger Robot
6a887018d4 Merge "[Wi-Fi] Quit worker thread of WifiPickerTracker" into rvc-dev am: 02b7b16c93 am: 9fc28c5a7f am: 133904ccf9 
Change-Id: I82322e1732f335d3cc56ed272cf1eff12ff273b0
 2020-05-13 05:14:20 +00:00
TreeHugger Robot
d739d688b0 Merge "[Wi-Fi] Quit worker thread of WifiPickerTracker" into rvc-dev am: 02b7b16c93 am: 9fc28c5a7f am: 6cb294d26d 
Change-Id: Id658d21ddd309be2e1729001423bcf6d1acd4c57
 2020-05-13 05:14:01 +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
ca174c2f83 Merge "[Wi-Fi] Quit worker thread of WifiPickerTracker" into rvc-dev am: 02b7b16c93 am: 3a92145c27 
Change-Id: I03aa7609edc4714acd9f4545f8b2f7c55a2c7b12
 2020-05-13 04:57:13 +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
133904ccf9 Merge "[Wi-Fi] Quit worker thread of WifiPickerTracker" into rvc-dev am: 02b7b16c93 am: 9fc28c5a7f 
Change-Id: I420782413bbb3e03d432acaea0cc1b50f6836850
 2020-05-13 04:56:59 +00:00
TreeHugger Robot
3a92145c27 Merge "[Wi-Fi] Quit worker thread of WifiPickerTracker" into rvc-dev am: 02b7b16c93 
Change-Id: I0e802903266825f2286466421a6880fc7732e974
 2020-05-13 04:36:32 +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
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