Commit Graph

122289 Commits

Author SHA1 Message Date
Chaohui Wang
046d7356c2 Merge "Use correct App info screen's trash can icon" into udc-dev am: d66335ae1c am: a90bbde69f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981558

Change-Id: I20704202fa0e85f67dfb56e17a808e25ed30f343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 08:13:07 +00:00
Chaohui Wang
a90bbde69f Merge "Use correct App info screen's trash can icon" into udc-dev am: d66335ae1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981558

Change-Id: Iaf2a725e7dea566fe1bff5dd805598587482b1d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 07:30:56 +00:00
Chaohui Wang
d66335ae1c Merge "Use correct App info screen's trash can icon" into udc-dev 2023-05-03 07:01:57 +00:00
Wenhui Yang
66defa99d9 Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev am: 25de3b2b9c am: 4e4941480f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22955471

Change-Id: Ie44e01786c43a3989e8076b7bf19654407f067ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 06:29:44 +00:00
Charles Chen
497393ed85 Merge "Disable Settings large-screen optimization" into udc-dev am: cb5a240361 am: 2258dd83cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885038

Change-Id: Ieb1404f5045c6a32d35e045381dedb217cc93097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 06:28:47 +00:00
Wenhui Yang
4e4941480f Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev am: 25de3b2b9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22955471

Change-Id: I0a7131567f578e045d20bc92fa50b1e4fb3f85cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 06:28:24 +00:00
Wenhui Yang
25de3b2b9c Merge "Fix overlap in udfps_enroll_enrolling" into udc-dev 2023-05-03 06:11:23 +00:00
Charles Chen
2258dd83cd Merge "Disable Settings large-screen optimization" into udc-dev am: cb5a240361
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885038

Change-Id: I38c795e9729694e7720387dde7e8c2d5ece5e3ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 05:48:14 +00:00
Charles Chen
cb5a240361 Merge "Disable Settings large-screen optimization" into udc-dev 2023-05-03 05:44:08 +00:00
Chaohui Wang
2aca9d40f8 Use correct App info screen's trash can icon
Fix: 280120259
Test: Visual
Change-Id: I954c344c3f5fdd256de7519f1534c982c084a521
2023-05-03 11:59:43 +08:00
Gil Cukierman
38a1a3222c Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab am: 6b5aa480de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756

Change-Id: I68cc91998ade8d4986d3852f091655e08cad0ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:32:05 +00:00
Gil Cukierman
6b5aa480de Merge "Enable null cipher toggle by default" into udc-dev am: 6a2f6960ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932756

Change-Id: I7a4655c5ac9ef9e7d66486591e1cfe566f385a47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 23:50:13 +00:00
Diya Bera
ba1b53e93e Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156 am: eb63f480cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757

Change-Id: Icd7ae4ce31f59c7a0e3d47d368d9904c743384eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 23:32:08 +00:00
Becca Hughes
5215358c2c Fork autofill default app selection am: ddf359d0f8 am: 02e4e1d05f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922

Change-Id: Iffea8157079911c9a26de9cf8f03c3cea3f6d3fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 23:31:48 +00:00
Gil Cukierman
6a2f6960ab Merge "Enable null cipher toggle by default" into udc-dev 2023-05-02 23:11:40 +00:00
Diya Bera
eb63f480cc Merge "Remove "Try again" from fingerprint error dialog" into udc-dev am: 7dd5f5e156
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22933757

Change-Id: I97f9fe6b4e4fc3abaeff42490b32008c760cb29a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 22:48:27 +00:00
Becca Hughes
02e4e1d05f Fork autofill default app selection am: ddf359d0f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912922

Change-Id: Ibf684e0c968d8dfa39f3fa5a74929c0acf0bbd8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 22:47:39 +00:00
Diya Bera
7dd5f5e156 Merge "Remove "Try again" from fingerprint error dialog" into udc-dev 2023-05-02 22:34:09 +00:00
Becca Hughes
09b2df4303 Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd59b am: c5f2edcb4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585

Change-Id: I490298203b8748898ae07ca00a9372241b2e6199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 21:46:55 +00:00
Becca Hughes
c5f2edcb4c Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd59b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585

Change-Id: I44dc0cd87c0be7df8b1506d203078ff57ff21138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 21:03:56 +00:00
Becca Hughes
ddf359d0f8 Fork autofill default app selection
We are merging the default app selection for autofill
with credman so this forks the existing UI (so we can
flag it off).

Test: ondevice
Bug: 278919696
Change-Id: I96bcf1ff86b169a182b9974f7384c45b474c3d5d
2023-05-02 20:31:14 +00:00
Becca Hughes
99f45dd59b Merge "Add combined provider class that manages new settings UI" into udc-dev 2023-05-02 20:16:32 +00:00
Ioana Alexandru
e0551da7c5 Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4 am: c1c20274c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539

Change-Id: I0e8043ab275a62be19c5ed8a210e5f426c295d53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 18:12:50 +00:00
Becca Hughes
ea03b3e2a0 Add combined provider class that manages new settings UI
Example of how to use: https://paste.googleplex.com/6523798525313024

Test: make
Bug: 278919696
Change-Id: I934a5f6d02b50f8c97bda6d997902a42ff88e26f
2023-05-02 17:37:44 +00:00
Ioana Alexandru
c1c20274c6 Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539

Change-Id: Ia4348c7ab9369a0bb40dd30c2db39e6824e1bc02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 17:32:30 +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
251da57429 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: I55486c2659d78ccb300f19f26b20425b315ed5ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:20:43 +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
Treehugger Robot
d624141732 Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev 2023-05-02 14:47:48 +00:00
Lucas Silva
439cdd904f 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: I8a912351bcd312ca984343dc24e4a44d61520167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 14:47:12 +00:00
Chaohui Wang
34deed3eda 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: I986376365180201cd503c4080f80e5007917e658
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 14:46:19 +00:00
Treehugger Robot
e769c5b4c9 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: I1212ac1e7b15b6280b1ae5386a916d1295d438bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 14:43:24 +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
9bd47de298 Merge "Fix colors for dreams settings according to new spec" into udc-dev 2023-05-02 14:00:22 +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
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
George
750cd809fe Fork the NfcTagAppsSettings page to SPA
The page is located at "Apps > Special app access > Nfc launch"

Bug: 267404181
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NfcTagAppsPreferenceControllerTest
Change-Id: I9fb4a68634f0b6f20d5f87601c1175ced33daad5
2023-05-02 10:15:53 +00:00
Chaohui Wang
bf9ba71cba Merge "Fix Data Saver page crashed when rotate" into udc-dev 2023-05-02 09:50:17 +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
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
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
55d7c97022 Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev 2023-05-02 02:31:02 +00:00