PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,956 Commits 1 Branch 0 Tags
b0e8942b2d69e65611fb137ebaced11e1c42115c
Commit Graph

124956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edgar Wang
2d11be89ac Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev am: 55d7c97022 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931168

Change-Id: If6fcde2c5608f8a6b5df847c1bbc3ee5ed9bde9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 02:33:22 +00:00
Edgar Wang
6f58822892 Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev am: 10129dc926 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930678

Change-Id: Ia6de8439e8162055b14c595aeeb578badeaad701
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 02:33:10 +00:00
Treehugger Robot
bece4e54d2 Merge "Support incompatible charger state in the Settings main page" into udc-dev am: 65efc1f45e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954539

Change-Id: I75dad8aadc2147cf0201a89160915a63cc600dea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 02:32:00 +00:00
Edgar Wang
55d7c97022 Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev 2023-05-02 02:31:02 +00:00
Edgar Wang
10129dc926 Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev 2023-05-02 02:30:24 +00:00
Grace Cheng
ed0a80fe44 Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev am: 8b36777419 am: fba051fff0 am: a18fa5dda6 am: a7d56ca27e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911556

Change-Id: If2a0a75522d4f73c53695d2649250093f779ca7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 02:17:18 +00:00
Grace Cheng
fb52e9b54b Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev am: 8b36777419 am: fba051fff0 am: 84da4a0141 am: 39e68e1f2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911556

Change-Id: I603950adb9281454b2ba5f6e04750957a6fad25c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 02:07:54 +00:00
Grace Cheng
9d1962ade8 Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev am: 8b36777419 am: 7771d0eab0 am: 8347708f8a am: 7cfd6a5cae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911556

Change-Id: Ib268b6c208306b7babd56d2df4a2ade0dc9faf84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 01:56:56 +00:00
Treehugger Robot
65efc1f45e Merge "Support incompatible charger state in the Settings main page" into udc-dev 2023-05-02 01:51:10 +00:00
Grace Cheng
a7d56ca27e Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev am: 8b36777419 am: fba051fff0 am: a18fa5dda6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911556

Change-Id: I5ee59478b0aa32d26195a6663b650df08017e210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 01:13:47 +00:00
Grace Cheng
39e68e1f2c Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev am: 8b36777419 am: fba051fff0 am: 84da4a0141 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911556

Change-Id: I9752ee3aea2b76ddeb7829125047ac30fd5a9bef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 00:56:59 +00:00
Grace Cheng
7cfd6a5cae Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev am: 8b36777419 am: 7771d0eab0 am: 8347708f8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911556

Change-Id: I00a403958ccf831af9b1e7d39eeab9dd05096348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 00:51:33 +00:00
Grace Cheng
a18fa5dda6 Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev am: 8b36777419 am: fba051fff0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911556

Change-Id: I028728170bdec5d604f5b781bacad29d0da9a991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 00:30:40 +00:00
Grace Cheng
84da4a0141 Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev am: 8b36777419 am: fba051fff0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911556

Change-Id: Iff165c96b94ee1958616e0494ac77b14666c3e34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 00:29:43 +00:00
Grace Cheng
1fdc38fe4d Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev am: 8b36777419 am: 9ae24317d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911556

Change-Id: I3238e6d0e7681f121cabdba444be6ac0a4a10bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 00:29:42 +00:00
Grace Cheng
8347708f8a Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev am: 8b36777419 am: 7771d0eab0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911556

Change-Id: I70f7354d948a6e9cda23a301117b31ac39b0ed1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 00:12:05 +00:00
Grace Cheng
9ae24317d2 Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev am: 8b36777419 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911556

Change-Id: Iff7b459f36c70d40d4b2117e02dc7620c7504aac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 23:53:50 +00:00
Grace Cheng
fba051fff0 Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev am: 8b36777419 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911556

Change-Id: Ib8ab21f84ea24e97470854ed7c2ed5f12e262d5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 23:50:17 +00:00
Grace Cheng
7771d0eab0 Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev am: 8b36777419 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911556

Change-Id: Ia74f13072f0779f8c3a4a08a254dd6857200fcd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 23:32:03 +00:00
Grace Cheng
8b36777419 Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev 2023-05-01 22:40:59 +00:00
Lucas Silva
94b5a9e147 Fix colors for dreams settings according to new spec 
Fixes: 279780657
Test: open settings > display > screen saver and verified colors are
correct in both light/dark modes

Change-Id: Ibb2ba40807c937161f4dfa565f10d0ca2fb35549
 2023-05-01 15:21:11 -04:00
Kweku Adams
02206d21e5 Merge "Use string notifications_disabled instead of off" into udc-dev am: 83c04b32d1 am: e6fe38f80c am: eafef5fe67 am: cfb5694a17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22938598

Change-Id: I0585af663c883b3c238e380a65b2ae1bbcc96637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 18:39:32 +00:00
Kweku Adams
b6becc23ba Merge "Use string notifications_disabled instead of off" into udc-dev am: 83c04b32d1 am: 97252eed2d am: c9b6e9af37 am: 9537eae631 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22938598

Change-Id: I7331569765b86cacd6218b20bf799da25725e4b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 18:35:53 +00:00
Kweku Adams
3b2bc2037e Merge "Use string notifications_disabled instead of off" into udc-dev am: 83c04b32d1 am: e6fe38f80c am: c608c84b81 am: 058d4acb67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22938598

Change-Id: I8584284f0a24739c24149e2f68ba53a88db137a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 18:27:08 +00:00
Kweku Adams
cfb5694a17 Merge "Use string notifications_disabled instead of off" into udc-dev am: 83c04b32d1 am: e6fe38f80c am: eafef5fe67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22938598

Change-Id: Ia481d3b950761de79f6b2a4e2024da31e42d6128
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 17:45:01 +00:00
Kweku Adams
9537eae631 Merge "Use string notifications_disabled instead of off" into udc-dev am: 83c04b32d1 am: 97252eed2d am: c9b6e9af37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22938598

Change-Id: Ic66c5cc6b9fc52bda34bfbcb43aa4b3ecbc44048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 17:40:39 +00:00
Kweku Adams
058d4acb67 Merge "Use string notifications_disabled instead of off" into udc-dev am: 83c04b32d1 am: e6fe38f80c am: c608c84b81 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22938598

Change-Id: I22add623e327929d08ec9eec387907c1505e95b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 17:38:43 +00:00
Kweku Adams
c9b6e9af37 Merge "Use string notifications_disabled instead of off" into udc-dev am: 83c04b32d1 am: 97252eed2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22938598

Change-Id: I0fb02fb745259743f7fe25c88afb12e0e54f4213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 17:01:31 +00:00
Kweku Adams
eafef5fe67 Merge "Use string notifications_disabled instead of off" into udc-dev am: 83c04b32d1 am: e6fe38f80c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22938598

Change-Id: Id6d5832f086b4ca773f90a1a53a2fbc3811888c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 17:01:18 +00:00
Kweku Adams
a8498b14f9 Merge "Use string notifications_disabled instead of off" into udc-dev am: 83c04b32d1 am: bdf3cb8df9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22938598

Change-Id: I1cbd994f1906de6e5e6eea57bb7adb89f0a925f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 16:57:21 +00:00
Kweku Adams
c608c84b81 Merge "Use string notifications_disabled instead of off" into udc-dev am: 83c04b32d1 am: e6fe38f80c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22938598

Change-Id: Iaa0953b19f7624094ca5d7861d36daaeb7ed11cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 16:56:33 +00:00
Kweku Adams
bdf3cb8df9 Merge "Use string notifications_disabled instead of off" into udc-dev am: 83c04b32d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22938598

Change-Id: Ic0c8f13e3d2a6e26c0c42e65d58d112df33c2206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 16:18:59 +00:00
Kweku Adams
e6fe38f80c Merge "Use string notifications_disabled instead of off" into udc-dev am: 83c04b32d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22938598

Change-Id: I70720fd6a505dfed13296f32d3d8109053faef1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 16:18:44 +00:00
Kweku Adams
97252eed2d Merge "Use string notifications_disabled instead of off" into udc-dev am: 83c04b32d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22938598

Change-Id: I89c3e6121bbb4083d1f6c49ce4819bf495ce1ecc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 16:14:31 +00:00
ykhung
09c1a4a850 Support incompatible charger state in the Settings main page 
https://screenshot.googleplex.com/9af4YCnCCjKHCFY

Bug: 271775549
Test: make test RunSettingsRoboTests
Change-Id: I6562e1b48a85ceceb20389ed87e55e0093040be2
 2023-05-02 00:04:01 +08:00
Kweku Adams
83c04b32d1 Merge "Use string notifications_disabled instead of off" into udc-dev 2023-05-01 15:37:22 +00:00
Florian Mayer
c99c64d1cc Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 am: 6dd4f9a4ec am: cfe9a7ce26 am: ff9e083367 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: I16980d9996454979736f71b69df00298123070b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 12:50:12 +00:00
Florian Mayer
8a56f78e2b Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 am: 3be6f32c42 am: 3b97ebd313 am: 44b5faab72 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: I0e67699e53f8cce5d04d0a9d7d3092ea95130a91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 12:50:03 +00:00
Florian Mayer
c0a7698d9c Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 am: 6dd4f9a4ec am: 6fe9a4850b am: 95aa157989 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: Ie9acf7a368f621532502b6f5e7bf877a2d7c9003
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 12:48:55 +00:00
Florian Mayer
ff9e083367 Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 am: 6dd4f9a4ec am: cfe9a7ce26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: I9d452b2c40e1e5e5e37cf4908a51431792d9ec37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 12:28:21 +00:00
Florian Mayer
44b5faab72 Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 am: 3be6f32c42 am: 3b97ebd313 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: I5672a9d6189c2704dcdedecdc724cda6cd57f8b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 12:19:44 +00:00
Florian Mayer
95aa157989 Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 am: 6dd4f9a4ec am: 6fe9a4850b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: Id5402eefa342e946abfd754ed004581b4fae303c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 12:18:55 +00:00
Florian Mayer
3b97ebd313 Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 am: 3be6f32c42 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: Ibe979ce519a989a6121adf21a8723f712539c504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 11:46:25 +00:00
Florian Mayer
cfe9a7ce26 Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 am: 6dd4f9a4ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: Ibb342dd0c0da8b2a6381d89a6848cda76db482e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 11:45:55 +00:00
Florian Mayer
d8526d4c9c Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 am: b112a868a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: Iaed6b8d9d579e2bb5f96bdb427ed3779933dd731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 11:41:54 +00:00
Florian Mayer
6fe9a4850b Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 am: 6dd4f9a4ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: I7bb16d6032f3904dba39ed87fccde24c1cadeec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 11:41:53 +00:00
Florian Mayer
6dd4f9a4ec Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: I7d000eba56ef08dfbe53fb3417b00dc5d7bdd3dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 11:03:01 +00:00
Florian Mayer
b112a868a8 Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: Ie6a7093cbfd8e71f63d448cfa4927eb189b5ff29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 11:03:00 +00:00
Florian Mayer
3be6f32c42 Merge "Fix typo in MemtagHelper" into udc-dev am: d7bbff0041 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931417

Change-Id: Ia7cef08103ad0faaedbcb26051757d3ef93b4e1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 10:58:56 +00:00
Florian Mayer
d7bbff0041 Merge "Fix typo in MemtagHelper" into udc-dev 2023-05-01 10:26:47 +00:00