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

69726 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Betty Chang
a4b36ed9a0 [automerger skipped] Merge "Add setPackage for PendingIntent in SliceHelper" into rvc-dev am: 0c821c7be2 am: 27e950f857 am: d9272e4223 am: b906213499 -s ours am: 843d0885d9 -s ours 
am skip reason: Change-Id I33c1333f9b5472cdb962b272f6be52a2d2959376 with SHA-1 0383d76a5e is in history

Change-Id: I52c2b004360aab24a4612eb9005afb8a400cde8e
 2020-05-13 04:29:11 +00:00
Betty Chang
9b7bba1b54 [automerger skipped] Merge "Add setPackage for PendingIntent in SliceHelper" into rvc-dev am: 0c821c7be2 am: f3740eec9d am: dc0a1ea53f am: cb2e8f3f4e -s ours am: 7c5b0b0038 -s ours 
am skip reason: Change-Id I33c1333f9b5472cdb962b272f6be52a2d2959376 with SHA-1 e231e87e80 is in history

Change-Id: I466fc97ad34a9ca8280872b59d726b85d4f40eac
 2020-05-13 04:28:14 +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
Automerger Merge Worker
2e3ca89fc6 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 am: a7b489b701 
Change-Id: Id8729a4bda5db26e2e159ce94292d1bcf031217e
 2020-05-13 03:39:43 +00:00
TreeHugger Robot
4462cfa2a3 Merge "Revert "Create QS media player setting"" into rvc-dev am: cd3cde6169 am: 8f50f01f8b am: 02c3704871 am: bf93beaefd am: 74feafde36 
Change-Id: Ia699d334f3d52dde0a91fbbaa01a3bed73bdfba8
 2020-05-13 03:39:24 +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
TreeHugger Robot
67e2d8d738 Merge "Revert "Create QS media player setting"" into rvc-dev am: cd3cde6169 am: 8f50f01f8b am: 811d4df610 am: eddfbfbf79 am: a2b7973714 
Change-Id: I6171321300c1ea288d1e0a3fd1704110bd95bf18
 2020-05-13 03:39:03 +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
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
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
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
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
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
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
TreeHugger Robot
cd3cde6169 Merge "Revert "Create QS media player setting"" into rvc-dev 2020-05-13 02:20:05 +00:00
TreeHugger Robot
8acdacb4b8 Merge "Remove the xml for bubble pref in developer options" into rvc-dev am: 60920beb86 am: ecb721e343 am: 39cac1f86a am: f97470a6fb am: d2b7e448b6 
Change-Id: I5a8e9b020f4ab5be8db303481ae2946e95547c4b
 2020-05-12 23:26:15 +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
3a4dfb2b96 Merge "Fix the issue that title of Color inversion page is wrong" into rvc-dev am: 394f925729 am: 9beb837352 am: 623c3feffe am: 72cc358db5 am: d52c713834 
Change-Id: I8188298e3dc8d73d2153d1740a73bba15008b2c3
 2020-05-12 23:18:34 +00:00
Jay Aliomer
2efd581597 Merge "Unable to select twilight scheduling after enabling location" into rvc-dev am: a5e7d180f1 am: 09312d8e70 am: 6f85a575aa am: 6555edd9ee am: 9a0fbc3aab 
Change-Id: I25029a1831b2d7ca87952dbf522bb994ca45703d
 2020-05-12 23:18:20 +00:00
Kholoud Mohamed
7f44a8235a Merge "String changes in the cross profile settings page" into rvc-dev am: 311ff0c1ea am: c60cf0bc3e am: 87eddfe807 am: 80049a0b78 am: 6f18ace0ba 
Change-Id: I15fdd6c2a26a78141023894c24080303e2a0b01d
 2020-05-12 23:18:08 +00:00
TreeHugger Robot
2976c953d6 Merge "Fix broken test cases" into rvc-dev am: defd64c797 am: f6d924b9dd am: 1ad4898230 am: a23259cbf7 am: 11351b2fc2 
Change-Id: Ibd03b7fb7f166d8bf1d32e2788987c60eb084d59
 2020-05-12 23:18:01 +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
PETER LIANG
3ff0148151 Merge "Add the settings content observer for shortcut preference." into rvc-dev am: a85f5dc80b am: e65f7a776d am: 03b27c3278 am: 25e665eb73 am: 697a5e91b4 
Change-Id: Ib56161a12918b92570b844c18b38b67227701bc4
 2020-05-12 23:17:34 +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
Jason Chiu
b67faaf893 Merge "Rearrange styles and remove the same attributes as the parent style" into rvc-dev am: b0230a6106 am: 29dded7d48 am: 04eb15b5f4 am: 3502d21e2f am: 2432fd21b5 
Change-Id: I3f076778de451cae0b95b08e9f0b65b231fc981b
 2020-05-12 23:17:02 +00:00
TreeHugger Robot
1c234860d8 Merge "Revise the text limit of volume shortcut key." into rvc-dev am: defa38c7ae am: 02a0c5c048 am: 9d99f584ca am: 916513a0b9 am: 4a2dfb5d87 
Change-Id: I79f34abff57b69c28afabd781b8d4f7acedfa3a0
 2020-05-12 23:16:44 +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
883e3571f1 Merge "Remove the xml for bubble pref in developer options" into rvc-dev am: 60920beb86 am: ecb721e343 am: 622adaa7ce am: b55dd57835 am: 9fe6aa2ab2 
Change-Id: I992c6bc34b9af1f06d057c7444764abe06f79a91
 2020-05-12 23:16:32 +00:00
Jason Hsu
2cdb45a7f3 Merge "Fix the issue that title of Color inversion page is wrong" into rvc-dev am: 394f925729 am: 9beb837352 am: b26a944cb5 am: 72261d55ea am: 473732a382 
Change-Id: Ia6312838092ed2d6aa62b564ec78f3bac2792327
 2020-05-12 23:16:20 +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
Jay Aliomer
5e022f0f1d Merge "Unable to select twilight scheduling after enabling location" into rvc-dev am: a5e7d180f1 am: 09312d8e70 am: 6add1fb28b am: baa7c500a3 am: 2f442d3fc2 
Change-Id: I7eaf4bd65a0d58078faa8934cefe69d1c43bea2e
 2020-05-12 23:15:31 +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
Jason Chiu
2432fd21b5 Merge "Rearrange styles and remove the same attributes as the parent style" into rvc-dev am: b0230a6106 am: 29dded7d48 am: 04eb15b5f4 am: 3502d21e2f 
Change-Id: I163c77027a81a109d03c2e2424712acd23e855bc
 2020-05-12 23:13:56 +00:00
TreeHugger Robot
4a2dfb5d87 Merge "Revise the text limit of volume shortcut key." into rvc-dev am: defa38c7ae am: 02a0c5c048 am: 9d99f584ca am: 916513a0b9 
Change-Id: I4a42c5a1083e87b2c9ca97b64ed560eb072911e8
 2020-05-12 23:12:45 +00:00
TreeHugger Robot
9fe6aa2ab2 Merge "Remove the xml for bubble pref in developer options" into rvc-dev am: 60920beb86 am: ecb721e343 am: 622adaa7ce am: b55dd57835 
Change-Id: Ie822295261d01d75cf7591bc34a24ddced76b42c
 2020-05-12 23:12:01 +00:00
Jason Hsu
473732a382 Merge "Fix the issue that title of Color inversion page is wrong" into rvc-dev am: 394f925729 am: 9beb837352 am: b26a944cb5 am: 72261d55ea 
Change-Id: I78424be4116703a9befc49d260f6d7649abf6850
 2020-05-12 23:11:34 +00:00
Jay Aliomer
2f442d3fc2 Merge "Unable to select twilight scheduling after enabling location" into rvc-dev am: a5e7d180f1 am: 09312d8e70 am: 6add1fb28b am: baa7c500a3 
Change-Id: I9301a63a9b91344ce80a3c6b7dc60c958081f64b
 2020-05-12 23:08:36 +00:00
Kholoud Mohamed
21332ed122 Merge "String changes in the cross profile settings page" into rvc-dev am: 311ff0c1ea am: c60cf0bc3e am: 33c191b763 am: 970c2901b1 am: 29153c418b 
Change-Id: I6a8d93cfaad66c81cc4e618e03a9da2f5d77f4a7
 2020-05-12 23:08:27 +00:00