Commit Graph

122874 Commits

Author SHA1 Message Date
Ioana Alexandru
ca769153a0 Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539

Change-Id: Idb7f1807b789a1050e31e137f81631fc7f39f8e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 17:28:49 +00:00
Ioana Alexandru
e0a4a343c4 Fix AmbientDisplayAlwaysOn isSliceable.
I changed this method to return true in ag/22761786 thinking that it was
necessary (as per the example at
https://g3doc.corp.google.com/company/teams/apps-android-settings/howto/settings_slices.md#preference-controller),
but this breaks a test, so I'm rolling back that part of the change.

Fix: 279881487
Test: presubmit
Change-Id: I87716a0daf5face9a79f98353b49ea2166226279
2023-05-02 16:52:26 +00:00
Diya Bera
9814931fd8 Remove "Try again" from fingerprint error dialog
Test: Manual (Start enrollment and don't complete it for 10 minutes;
observe the dialog; screenshot in bug)
Bug: 279648300

Change-Id: I88280e3a5d47735285d89174ad8bcb0da8d39282
2023-05-02 09:51:36 -07:00
Treehugger Robot
3d746f793e Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732 am: dc5e91cec8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: I2daba6bdb99534ca9a943e7c5fc98c2ca96f943d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 16:04:32 +00:00
Treehugger Robot
9b53ff64ab Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732 am: d5921d0bcf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: Id16884d7d94fa7f214e34bea5e98271dbdf34cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:16:19 +00:00
Treehugger Robot
dc5e91cec8 Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: If4ea67c5c9ac76a576fa94fd6b9673082039ca1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:15:41 +00:00
Lucas Silva
c3284ad39a Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298 am: 0ff016cb7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954741

Change-Id: Ie413cb1e36ad0c870633b02c8571086761ac8655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:00:16 +00:00
Chaohui Wang
55ee4d3d9b Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba am: 0f915a4c35
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015

Change-Id: I25e90c935c9a363127f9bbdf79b90670fbe47fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 14:58:29 +00:00
Treehugger Robot
d5921d0bcf Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: I18fe27407d8f6003b597a4a9e98ed3b30cefe626
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 14:58:21 +00:00
Lucas Silva
65c8f6bcc6 Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298 am: bece3e4b9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954741

Change-Id: If495e687ef0f1cf0b5419e4a664cccaa68b3ef4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 14:53:43 +00:00
Treehugger Robot
d624141732 Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev 2023-05-02 14:47:48 +00:00
Treehugger Robot
8aad80fe7c Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3 am: 648266e8d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142

Change-Id: I3f6ce4bb58a9454b195dcdcb0e399f5fdb07fa79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 14:45:19 +00:00
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