Commit Graph

125771 Commits

Author SHA1 Message Date
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
69a8e59f33 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: I16d929bbf52b3b0d526875b8e2f5eab392af3c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 14:35:07 +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
bfc811f384 Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba am: 49eebbcfe6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015

Change-Id: Ie6a5ba59a28f40f7bfa0c9b9a33029634b011fd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 14:28:00 +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
Treehugger Robot
1ff9d7cc34 Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3 am: f6ba37e583
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142

Change-Id: Ifbc2f697f1c01683bab16227d5a02e9c3044575b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 14:24:35 +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
George
81fe8bb38e Fork the NfcTagAppsSettings page to SPA am: 750cd809fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22939919

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

Change-Id: I70590ee41284cad2b52de96f355a816a8d7b22a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 10:40:21 +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
Chaohui Wang
49eebbcfe6 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: I0da6f5cb3bf8f959e2c0f3fa206b9998bc744290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 10:35:05 +00:00
Treehugger Robot
f6ba37e583 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: Iba95c1e9a8bae422384970ed6fb31dd1ef32c099
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 10:30:14 +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
Edgar Wang
7e4239403f Merge "Fix PrivateDnsPreferenceControllerTest test case failed" into udc-dev am: 10129dc926 am: 6f58822892 am: 098f7911fe am: 0ff0cef977
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930678

Change-Id: I0ef118c97eb495fe85d98fea02aadd22c9b43774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 10:21:31 +00:00
Treehugger Robot
02b3e274d5 Merge "Support incompatible charger state in the Settings main page" into udc-dev am: 65efc1f45e am: bece4e54d2 am: 08d5543003 am: 223ddb4b20
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954539

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