PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
68,949 Commits 1 Branch 0 Tags
f3b155aa313fc040425531f69462a6afaf68b04d
Commit Graph

68949 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
f3b155aa31 Merge "Merge "Allows to launch only authenticator owned activities" into rvc-dev am: dfb3f561ea am: e9a5de28af am: e5025cde15" into rvc-qpr-dev-plus-aosp am: 87893ad51a 
Change-Id: Iebd0eb43285cd9d60c6311effa6d0901984410f5
 2020-05-13 06:14:21 +00:00
Automerger Merge Worker
88533538af Merge "Merge "Revert "Unable to select twilight scheduling after enabling location"" into rvc-dev am: 6d2ad68e1a am: bfa9b3e6dc" into rvc-d1-dev-plus-aosp am: aa7682468b am: 21f78fbf9f 
Change-Id: I421e1eecfa07e9de816160ffcec26be662a58d58
 2020-05-13 06:14:11 +00:00
Automerger Merge Worker
6031eb9ed0 Merge "Merge "Revert "Add the settings content observer for shortcut preference."" into rvc-dev am: 9ae5b47aee am: b726331702 am: 51b2b3d876" into rvc-qpr-dev-plus-aosp am: 1bb48aab53 
Change-Id: I1957c3bb747f2b85d4801e0c597ca8e2080528a4
 2020-05-13 06:13:53 +00:00
TreeHugger Robot
b867487ee8 Merge "Revert "Unable to select twilight scheduling after enabling location"" into rvc-dev am: 6d2ad68e1a am: bfa9b3e6dc am: 1ecadbd53d am: 038fd20c68 
Change-Id: Ib71eedc2b84e35be0b13a00212a509efa7215f63
 2020-05-13 06:13:27 +00:00
Automerger Merge Worker
265b3f9434 Merge "Merge "Revert "Add the settings content observer for shortcut preference."" into rvc-dev am: 9ae5b47aee am: 546c130e8d am: 88bf32682b" into rvc-qpr-dev-plus-aosp am: 6dbeabb7c9 
Change-Id: I6b40c38e1dd75478f7fb3286c486cf5d0960ea62
 2020-05-13 06:13:13 +00:00
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
Automerger Merge Worker
87893ad51a Merge "Merge "Allows to launch only authenticator owned activities" into rvc-dev am: dfb3f561ea am: e9a5de28af am: e5025cde15" into rvc-qpr-dev-plus-aosp 2020-05-13 06:00:43 +00:00
TreeHugger Robot
1135cb2082 Merge "Allows to launch only authenticator owned activities" into rvc-dev am: dfb3f561ea am: e9a5de28af am: e5025cde15 
Change-Id: I3384f09b997309352a02a20536ccb0413eb99730
 2020-05-13 06:00:38 +00:00
Automerger Merge Worker
21f78fbf9f Merge "Merge "Revert "Unable to select twilight scheduling after enabling location"" into rvc-dev am: 6d2ad68e1a am: bfa9b3e6dc" into rvc-d1-dev-plus-aosp am: aa7682468b 
Change-Id: I2af4bf8799bc09611617f4edc114009452f8eda9
 2020-05-13 06:00:36 +00:00
Automerger Merge Worker
1bb48aab53 Merge "Merge "Revert "Add the settings content observer for shortcut preference."" into rvc-dev am: 9ae5b47aee am: b726331702 am: 51b2b3d876" into rvc-qpr-dev-plus-aosp 2020-05-13 06:00:33 +00:00
TreeHugger Robot
c05a6a3800 Merge "Revert "Add the settings content observer for shortcut preference."" into rvc-dev am: 9ae5b47aee am: b726331702 am: 51b2b3d876 
Change-Id: Idf9eb1717dd96ab62de603f36ac1fc7a8a6c082b
 2020-05-13 06:00:28 +00:00
TreeHugger Robot
038fd20c68 Merge "Revert "Unable to select twilight scheduling after enabling location"" into rvc-dev am: 6d2ad68e1a am: bfa9b3e6dc am: 1ecadbd53d 
Change-Id: I5955e0a22d858c1ddfed4a77f4078954600279f2
 2020-05-13 06:00:24 +00:00
Automerger Merge Worker
6dbeabb7c9 Merge "Merge "Revert "Add the settings content observer for shortcut preference."" into rvc-dev am: 9ae5b47aee am: 546c130e8d am: 88bf32682b" into rvc-qpr-dev-plus-aosp 2020-05-13 06:00:12 +00:00
TreeHugger Robot
0fcd8f5e03 Merge "Revert "Add the settings content observer for shortcut preference."" into rvc-dev am: 9ae5b47aee am: 546c130e8d am: 88bf32682b 
Change-Id: Ic12d207951640b029abf499b605ab9a022b914bb
 2020-05-13 06:00:06 +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
e5025cde15 Merge "Allows to launch only authenticator owned activities" into rvc-dev am: dfb3f561ea am: e9a5de28af 
Change-Id: Ib01aa0abafbcb021544a34840b6455eba38c8bf2
 2020-05-13 05:40:59 +00:00
TreeHugger Robot
1ecadbd53d Merge "Revert "Unable to select twilight scheduling after enabling location"" into rvc-dev am: 6d2ad68e1a am: bfa9b3e6dc 
Change-Id: Id72f1df490223d7a894bc6e8904c15698584aed3
 2020-05-13 05:40:50 +00:00
Automerger Merge Worker
aa7682468b Merge "Merge "Revert "Unable to select twilight scheduling after enabling location"" into rvc-dev am: 6d2ad68e1a am: bfa9b3e6dc" into rvc-d1-dev-plus-aosp 2020-05-13 05:40:41 +00:00
TreeHugger Robot
f37eaffefc Merge "Revert "Add the settings content observer for shortcut preference."" into rvc-dev am: 9ae5b47aee am: 546c130e8d 
Change-Id: I8246b802b8a69fc29589610d19a1af0d890b7ac4
 2020-05-13 05:40:38 +00:00
TreeHugger Robot
f047391dec Merge "Revert "Unable to select twilight scheduling after enabling location"" into rvc-dev am: 6d2ad68e1a am: bfa9b3e6dc 
Change-Id: I342453648e882cf10d07fd7fac70d012eabf73cb
 2020-05-13 05:40:33 +00:00
TreeHugger Robot
51b2b3d876 Merge "Revert "Add the settings content observer for shortcut preference."" into rvc-dev am: 9ae5b47aee am: b726331702 
Change-Id: Ief6d5888d2a8c6e1e740e444177dcf40c3f318bd
 2020-05-13 05:40:32 +00:00
TreeHugger Robot
88bf32682b Merge "Revert "Add the settings content observer for shortcut preference."" into rvc-dev am: 9ae5b47aee am: 546c130e8d 
Change-Id: I243e43e4df96c407e1f8e514715dfee6c998fff7
 2020-05-13 05:40:08 +00:00
Automerger Merge Worker
313cf0159d Merge "Merge "[Wi-Fi] Quit worker thread of WifiPickerTracker" into rvc-dev am: 02b7b16c93 am: 3a92145c27 am: ca174c2f83" into rvc-qpr-dev-plus-aosp am: 244b321947 
Change-Id: Ifeed84f67eccc72515d37f72a9d33dd36c2d9583
 2020-05-13 05:30:06 +00:00
TreeHugger Robot
ed0520bb62 Merge "[Wi-Fi] Quit worker thread of WifiPickerTracker" into rvc-dev am: 02b7b16c93 am: 9fc28c5a7f am: 133904ccf9 am: 6a887018d4 
Change-Id: I2d8f186597f580ccb57e8179aa8ab3e143331180
 2020-05-13 05:29:51 +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
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
dfb3f561ea Merge "Allows to launch only authenticator owned activities" into rvc-dev 2020-05-13 05:26:25 +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