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
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
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
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
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
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
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
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
Wenhui Yang
3aae28c463
Fix overlap in udfps_enroll_enrolling
...
Fix the view overlap on R4 device when setting up fingerprint in
device registration or the font size set to largest. Please see
ag/21478828 for reference.
Test: Manual -
Set up fingerprint in device registration and observe the views
don't overlap.
Set up fingerprint in Settings with font size set to largest and observe the views don't overlap.
Bug: 275119187
Change-Id: I82d2a3941211801e2c4615ba9ba5a917f3cd9ea1
2023-05-01 22:18:47 +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
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
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
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
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
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
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
Florian Mayer
411d78c06c
Fix typo in MemtagHelper
...
Bug: 280034968
Change-Id: I5977925399342cd79f0bed2dd4af0e21c0c20102
2023-05-01 10:25:04 +00:00
ykhung
36a22e4250
Fix legacy failed tests to avoid block presubmit am: a0f3f421dd
am: 343284fe3f
am: 471bc178e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657
Change-Id: Ifccdcb116ae9caea1bc9ba39253383ffd34b348a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-30 09:46:08 +00:00
ykhung
6dd32fc6bc
Fix legacy failed tests to avoid block presubmit am: a0f3f421dd
am: 3684f9770e
am: f193d7bde7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657
Change-Id: I91faef2689ee2980e8bd5e9d1660ea2fa42f0e54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-30 09:42:05 +00:00
ykhung
4ca62fa226
Fix legacy failed tests to avoid block presubmit am: a0f3f421dd
am: 343284fe3f
am: 22bfa101c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657
Change-Id: I84930ab00682fcb0fa690167e1784b632851d619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-30 09:40:50 +00:00
ykhung
471bc178e5
Fix legacy failed tests to avoid block presubmit am: a0f3f421dd
am: 343284fe3f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657
Change-Id: I0f11401a21c9d9de656d46f298b86f2779b9115a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-30 09:04:18 +00:00
ykhung
f193d7bde7
Fix legacy failed tests to avoid block presubmit am: a0f3f421dd
am: 3684f9770e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657
Change-Id: I60bb7184eb58e5604f4d38904345ddad9b6cbbe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-30 09:03:36 +00:00
ykhung
22bfa101c5
Fix legacy failed tests to avoid block presubmit am: a0f3f421dd
am: 343284fe3f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948657
Change-Id: I82f634709288f4832bac0623bc5f08ca0ecfa3f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-30 08:59:37 +00:00