Lucas Silva
bece3e4b9f
Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954741
Change-Id: If83df1299e3c8c48850ed9a924485e45d2bc85cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 14:35:09 +00:00
Lucas Silva
0ff016cb7b
Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954741
Change-Id: I6ea288b4d1b61b7fae5e52dfd57f6edec5bb3b75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 14:31:11 +00:00
Chaohui Wang
719b2f1f60
Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba
am: ef748cfc36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015
Change-Id: Icdb02006b5c1370bf1e6a754b5f557309ab07def
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 14:27:56 +00:00
Lucas Silva
9bd47de298
Merge "Fix colors for dreams settings according to new spec" into udc-dev
2023-05-02 14:00:22 +00:00
Treehugger Robot
aa354d5666
Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3
am: 01d7ed6a61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142
Change-Id: I0f8ba89b5d6d2968b4770591218a786bdac00e79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 13:58:28 +00:00
tom hsu
21860761e8
[Settings] Remove WFC enabled state condition of querying Telecomm.
...
- Query WFC enabled state by querying Telecomm may have problem.
- Only use ImsMmTelManager API to check WFC enabled state.
Bug: 278108377
Test: atest passed
Change-Id: I6d1122bcf66ed5cd274e99b7b4f13558ab922162
2023-05-02 12:57:35 +00:00
Ankita Vyas
b32d02c293
Add tests for config check in ClonedAppsPreferenceController
...
Bug: 280071827
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=ClonedAppsPreferenceControllerTest
Change-Id: Id7c2e73bdb0c2af3e700b3620bde2fe77c47f3e6
2023-05-02 12:03:42 +00:00
tom hsu
fa0bdabc6a
[Settings] Fix NPE from updating subinfo changed.
...
- Refactor code to avoid NPE.
Bug: 278721219
Test: make passed
Test: atest MobileDataPreferenceControllerTest passed
Change-Id: I1fe57b8835677335ae9102cfff71451060ea4f78
2023-05-02 11:40:12 +00:00
Chaohui Wang
0f915a4c35
Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015
Change-Id: Ic155aa679959e8c8d49092869113cf24aa49c148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 10:39:17 +00:00
Chaohui Wang
ef748cfc36
Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015
Change-Id: I8e058b75c12a4bf2bf3462b83a23804e42db2acf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 10:35:15 +00:00
Treehugger Robot
01d7ed6a61
Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142
Change-Id: Ie0c10646accf9a9e9fdc219a76b84cf3cfd76872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 10:24:59 +00:00
Treehugger Robot
648266e8d7
Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142
Change-Id: I26d8b679b5783c6b86128ec9ac91a54592854f48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 10:19:39 +00:00
Chaohui Wang
bf9ba71cba
Merge "Fix Data Saver page crashed when rotate" into udc-dev
2023-05-02 09:50:17 +00:00
Vania Januar
a1af049378
Guard against null input device in StylusDeviceUpdater
...
Bug: 279170207
Test: StylusDeviceUpdaterTest
Change-Id: Ib4a3f12eaceb87370c800a9dc7eda819c706cd3b
2023-05-02 09:36:43 +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
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
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
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
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
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
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
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
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