Commit Graph

125351 Commits

Author SHA1 Message Date
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
Edgar Wang
079611ce5d Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev am: 55d7c97022 am: cd321d15a4 am: d71accda55 am: d056662467
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931168

Change-Id: I40b23e86ae3198f65793f3bc0e75a411c15fe690
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 10:19:07 +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
Edgar Wang
a6499d2d09 Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev am: 55d7c97022 am: cd321d15a4 am: e63e16d999 am: cf5052ddd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931168

Change-Id: I8e2723b21b466c3014211370d24bb0df4c3fe918
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 09:38:58 +00:00
Edgar Wang
2bff495d33 Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev am: 10129dc926 am: 11a93074f0 am: 22f05bbf1c am: bbc0e69398
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930678

Change-Id: I3ee1494b0b30f6fdaf18e5e72f70f1835a47892a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 09:38:07 +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
Treehugger Robot
300c880818 Merge "Support incompatible charger state in the Settings main page" into udc-dev am: 65efc1f45e am: 1352c72005 am: 81bc2c00cc am: 504e408398
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954539

Change-Id: I3b8a68f04b1760365ae4773d630c51febc30b9bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 08:56:10 +00:00
Edgar Wang
be1b8857ab Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev am: 10129dc926 am: 11a93074f0 am: 7dfbfcc9f5 am: 06f56a6e9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930678

Change-Id: Ia7aebb8a3ce3baf2091a3caddb50b68ea1c94705
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 08:29:55 +00:00
Treehugger Robot
c2d522d120 Merge "Support incompatible charger state in the Settings main page" into udc-dev am: 65efc1f45e am: 1352c72005 am: fdf3c2135c am: e6e3ede7e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954539

Change-Id: I6e989281fb32d05ac3bd67f6eab2d81cdc75a0f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 07:56:05 +00:00
Edgar Wang
baabc0aa38 Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev am: 55d7c97022 am: 2d11be89ac am: a7b9264095
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931168

Change-Id: Id16a4d033385b45923b2f2a3f63b79aeec6020ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 06:51:50 +00:00
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
Hiroki Sato
e44848cdce Don't show bubble settings when framework doesn't support it
Some devices don't support bubbles by configuring config_supportsBubble
value. When the value is set false, it doesn't make sense to show bubble
related preferences.

This CL disables showing bubble preferences when device doesn't support
it.

Bug: 274711609
Test: Set config_supportsBubble false, and check UI.
Test: m -j80 RunSettingsRoboTests ROBOTEST_FILTER="Bubble"
Change-Id: I670ad2a9e243819ea014e5e1ddb9d62ad76d2168
2023-05-02 15:46:27 +09: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
8870b51b59 Merge "Fix test case failed in SystemControlsFragmentTest" into udc-dev am: 55d7c97022 am: 164ddcf0b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22931168

Change-Id: I6c818afa043cbe9a8487ee06e0f6f3706e229f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 03:16:50 +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
Edgar Wang
08081471da Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev am: 10129dc926 am: 89e460ef92
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930678

Change-Id: If351ece8c7b9eeba4d0384c6f2c8b5567f9df4a4
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
Treehugger Robot
6ddc836713 Merge "Support incompatible charger state in the Settings main page" into udc-dev am: 65efc1f45e am: 3bef26666f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954539

Change-Id: Id0f3d8dcf8c127f2209f3567d10149fa37556290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 03:14:05 +00:00
Edgar Wang
164ddcf0b7 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: I97f15d49d699133299832b9a9cae65d3ef4a0bc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 02:37:27 +00:00
Edgar Wang
89e460ef92 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: Ib86059e5ca9dca8ca54fefa366d9ca44c4be1d22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 02:36:59 +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
Treehugger Robot
3bef26666f 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: Ic42b12957b18d1bb54a84806ace41f30ae23b437
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 02:36:13 +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
Grace Cheng
ed0a80fe44 Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev am: 8b36777419 am: fba051fff0 am: a18fa5dda6 am: a7d56ca27e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911556

Change-Id: If2a0a75522d4f73c53695d2649250093f779ca7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 02:17:18 +00:00
Grace Cheng
fb52e9b54b Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev am: 8b36777419 am: fba051fff0 am: 84da4a0141 am: 39e68e1f2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911556

Change-Id: I603950adb9281454b2ba5f6e04750957a6fad25c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 02:07:54 +00:00
Grace Cheng
9d1962ade8 Merge "Prevent NPE on deleting fingerprint in Settings" into udc-dev am: 8b36777419 am: 7771d0eab0 am: 8347708f8a am: 7cfd6a5cae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911556

Change-Id: Ib268b6c208306b7babd56d2df4a2ade0dc9faf84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 01:56:56 +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