Edgar Wang
0ff0cef977
Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev am: 10129dc926
am: 6f58822892
am: 098f7911fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930678
Change-Id: I6c356cef82571bd62e53fb274f9b981186c82729
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 06:51:26 +00:00
Treehugger Robot
223ddb4b20
Merge "Support incompatible charger state in the Settings main page" into udc-dev am: 65efc1f45e
am: bece4e54d2
am: 08d5543003
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954539
Change-Id: I36c1a895a24e322242a3817ee2e5d86862b4ae3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 06:50:15 +00:00
Charles Chen
1815ba7828
Disable Settings large-screen optimization
...
Disable the optimization that is automatically enabled when
including Window Extensions through Activity Embedding.
The optimization causes to launch an additional trampoline
activity for deep links, even when the screen size is smaller
than required by Activity Embedding rules.
This CL also rename isActivityEmbeddingEnabled to
shouldEnableLargeScreenOptimization because the method
may report false even if the device supports the feature
but Settings app doesn't for performance concern.
Bug: 267725145
Bug: 279461170
Test: Build, perf metrics
Test: atest LauncherIronwoodIntegrationTests:android.platform.test.scenario.launcher.integration_tests.HomescreenCustomizationTests
Test: atest SettingsMultiPaneDeepLinkTest.java
Change-Id: I38e8c62a61a344eb7a5cbfd1cd2c2137357d1a87
2023-05-02 14:16:22 +08:00
Treehugger Robot
3b60e2a9c3
Merge "Fix battery percentage is inconsistent in settings" into udc-dev
2023-05-02 05:08:39 +00:00
Edgar Wang
d056662467
Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev am: 55d7c97022
am: cd321d15a4
am: d71accda55
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931168
Change-Id: I0a5360b854e55ba2c183d6b5b58031ad4f7c629e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 04:37:35 +00:00
Edgar Wang
cf5052ddd2
Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev am: 55d7c97022
am: cd321d15a4
am: e63e16d999
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931168
Change-Id: I1ef3ea03f5dc91657493f5e50df1bd338de003ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 04:05:14 +00:00
Edgar Wang
bbc0e69398
Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev am: 10129dc926
am: 11a93074f0
am: 22f05bbf1c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930678
Change-Id: Ia75f5d5fa677ce4c9702815df36e34d810a7fab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 04:01:59 +00:00
Treehugger Robot
504e408398
Merge "Support incompatible charger state in the Settings main page" into udc-dev am: 65efc1f45e
am: 1352c72005
am: 81bc2c00cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954539
Change-Id: Ia12f352769c4774d8d98fd05401709e386e920d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 04:01:19 +00:00
ykhung
0288b6d4af
Fix battery percentage is inconsistent in settings
...
Fix: 275217364
Test: make test RunSettingsRoboTests
Change-Id: I16dd772aacaea3f8ddb6da579adb033124e3dbb7
2023-05-02 11:58:08 +08:00
Edgar Wang
06f56a6e9f
Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev am: 10129dc926
am: 11a93074f0
am: 7dfbfcc9f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930678
Change-Id: I664ee9ab68bd77f7c3b8b4fdd807c0b598db30bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 03:48:53 +00:00
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
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