Treehugger Robot
e6e3ede7e8
Merge "Support incompatible charger state in the Settings main page" into udc-dev am: 65efc1f45e
am: 1352c72005
am: fdf3c2135c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954539
Change-Id: I205ff1b4e0acea5b48751cfdc230274128b77598
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 03:35:11 +00:00
Edgar Wang
a7b9264095
Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev am: 55d7c97022
am: 2d11be89ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931168
Change-Id: Ife96f8b3d6237f0520516ffee98f980a9d9c5bae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 03:21:59 +00:00
Edgar Wang
098f7911fe
Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev am: 10129dc926
am: 6f58822892
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930678
Change-Id: I177b06b694701616b9f1d467f2437782ca3e2efb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 03:21:50 +00:00
Treehugger Robot
08d5543003
Merge "Support incompatible charger state in the Settings main page" into udc-dev am: 65efc1f45e
am: bece4e54d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954539
Change-Id: I8b41aa4c352bd36a4b601ca73b8628354447d61b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 03:20:10 +00:00
Edgar Wang
d71accda55
Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev am: 55d7c97022
am: cd321d15a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931168
Change-Id: I272c1bdb522a28e8e5b29803e01abc607bea7e7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 03:18:24 +00:00
Edgar Wang
22f05bbf1c
Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev am: 10129dc926
am: 11a93074f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930678
Change-Id: Ibef72105e9b449d1f6097c0d90800ae11efeb5c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 03:18:17 +00:00
Treehugger Robot
81bc2c00cc
Merge "Support incompatible charger state in the Settings main page" into udc-dev am: 65efc1f45e
am: 1352c72005
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954539
Change-Id: I6beea870245b54f33ae00364e84cc6f7b4e18dc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 03:18:10 +00:00
Edgar Wang
e63e16d999
Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev am: 55d7c97022
am: cd321d15a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931168
Change-Id: I1e3d2b3127c1c701dbe7c4db7e865ebe86a49d08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 03:17:24 +00:00
Edgar Wang
8870b51b59
Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev am: 55d7c97022
am: 164ddcf0b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931168
Change-Id: I6c818afa043cbe9a8487ee06e0f6f3706e229f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 03:16:50 +00:00
Edgar Wang
7dfbfcc9f5
Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev am: 10129dc926
am: 11a93074f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930678
Change-Id: I96d3fad7f717639a256225d55679e52be628e854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 03:15:05 +00:00
Edgar Wang
08081471da
Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev am: 10129dc926
am: 89e460ef92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930678
Change-Id: If351ece8c7b9eeba4d0384c6f2c8b5567f9df4a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 03:15:05 +00:00
Treehugger Robot
fdf3c2135c
Merge "Support incompatible charger state in the Settings main page" into udc-dev am: 65efc1f45e
am: 1352c72005
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954539
Change-Id: I11951d054ee660042517daa16bcee868e241ee2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 03:14:05 +00:00
Treehugger Robot
6ddc836713
Merge "Support incompatible charger state in the Settings main page" into udc-dev am: 65efc1f45e
am: 3bef26666f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954539
Change-Id: Id0f3d8dcf8c127f2209f3567d10149fa37556290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 03:14:05 +00:00
Edgar Wang
164ddcf0b7
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: I97f15d49d699133299832b9a9cae65d3ef4a0bc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 02:37:27 +00:00
Edgar Wang
89e460ef92
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: Ib86059e5ca9dca8ca54fefa366d9ca44c4be1d22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 02:36:59 +00:00
Edgar Wang
cd321d15a4
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: I17f261e3f7b5db0cf09b2ce5cd055109c0674ef4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 02:36:34 +00:00
Edgar Wang
11a93074f0
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: Ib8d8a7d9f5e8a26d327a9ed0f22f23aac2194400
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 02:36:26 +00:00
Treehugger Robot
1352c72005
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: Ia8813239148539ba7da86305209102262f40d9c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 02:36:16 +00:00
Treehugger Robot
3bef26666f
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: Ic42b12957b18d1bb54a84806ace41f30ae23b437
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 02:36:13 +00:00
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