Commit Graph

2318 Commits

Author SHA1 Message Date
Yi-Ling Chuang
b2a488ff78 Merge "Refactor battery related feature provider" into udc-qpr-dev am: 75af9aa3f5 am: 9736f648de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382081

Change-Id: If741f7c37358727bcacf0b880548c28aecaf5f91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 20:18:13 +00:00
Yi-Ling Chuang
9736f648de Merge "Refactor battery related feature provider" into udc-qpr-dev am: 75af9aa3f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382081

Change-Id: I9359ab804d13a008f5c5863f4b9443998cf7d77b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 07:28:08 +00:00
Yi-Ling Chuang
75af9aa3f5 Merge "Refactor battery related feature provider" into udc-qpr-dev 2023-05-24 06:55:17 +00:00
Yi-Ling Chuang
ee97eaf2d9 Refactor battery related feature provider
Merge BatteryInfoFeatureProvider to BatterySettingsFeatureProvider. Also
add a new string to indicate the unavailability when there's error
fetching the cycle count value.

Bug: 276399056
Test: robotests
Change-Id: Ic6a641d72d5bb295f2a0766dcebdcbe855d91125
2023-05-24 11:26:07 +08:00
Yuxin Hu
0183cfd816 Fix "Enable ANGLE" switch behavior when Developer Option Switch is off
Fix below bugs:
1) When developer option switch is turned off,
"Enable ANGLE" switch is not disabled. Fixed it in
GraphicsDriverEnableAngleAsSystemDriverController::update().

2) When user turns off developer option switch,
a restart is not always mandatory. However, we should ask
user to restart the device is "Enable ANGLE" is forced to
change due to developer option switch turning off.
Fixed it in DevelopmentSettingsDashboardFragment::onSwitchChanged().

3) When user turns off developer option switch and
the reboot dialog pops up, user can dismiss the dialog by
not clicking either POSITIVE_BUTTON or NEGATIVE_BUTTON.
We should enforce user to click the button and disallow the
option to dimiss the dialog by touching screen areas
outside the window's bounds.
Fixed it in DisableDevSettingsDialogFragment.java.

Did a few clean-up and in
GraphicsDriverEnableAngleAsSystemDriverController.java, and updated
unit test to reflect new code behavior.

Bug: b/270994705
Test: m; flash and device can boot.
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest
Test: atest GraphicsDriverEnableAngleAsSystemDriverControllerTest
Test: atest SettingsRoboTests:FreeformWindowsPreferenceControllerTest
Test: atest SettingsRoboTests:DesktopModePreferenceControllerTest

Change-Id: I199b2fe59b6ad948b753793254c822a293d8b40d
2023-05-24 01:37:35 +00:00
Chun-Ku Lin
b8084ecfcd Unified service and shortcut state summary on a11y settings page.
Bug: 210026562
Test: manual
Test: atest

Change-Id: I4d5ff6b10d6bfd2fe6b3de1849d00a9d084bf269
2023-05-23 22:19:55 +00:00
Lex Huang
19aefe0421 Merge "Fix ActivityNotFoundException" into udc-qpr-dev am: ebab5f6e38 am: 6e256487b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23352276

Change-Id: I4b0a33bc60f6f76df63d899295c2adbd09fd7beb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 07:28:20 +00:00
Lex Huang
6e256487b3 Merge "Fix ActivityNotFoundException" into udc-qpr-dev am: ebab5f6e38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23352276

Change-Id: I2e1f9cbb5f54b38d3f4c29ca903569e13adc71ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 07:04:42 +00:00
Lex Huang
ebab5f6e38 Merge "Fix ActivityNotFoundException" into udc-qpr-dev 2023-05-22 06:51:08 +00:00
Treehugger Robot
b8562ad63e Merge "Add a new feature provider for Battery info page" into udc-qpr-dev am: 70c89004ee am: bd47587e8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308379

Change-Id: I0df1f80e08ed37a975676940367ed5a086925556
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 17:01:37 +00:00
Treehugger Robot
bd47587e8b Merge "Add a new feature provider for Battery info page" into udc-qpr-dev am: 70c89004ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308379

Change-Id: I45e4b2f609ced644754410db120e5cd25ad5b6f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 16:18:59 +00:00
Lex Huang
b9c0368d7a Fix ActivityNotFoundException
Set intent to preference if intent.resolveActivity is non-null
Set preference selectable to false if no intent set to preference

Fix: 283107867
Test: manual, atest BlockingPrefWithSliceControllerTest
Change-Id: Ib5e8705debb5eb5224d8566215cb65f36613d8f9
2023-05-19 15:57:18 +00:00
Treehugger Robot
70c89004ee Merge "Add a new feature provider for Battery info page" into udc-qpr-dev 2023-05-19 15:35:37 +00:00
Yi-Ling Chuang
7a32e871dc Add a new feature provider for Battery info page
This feature provider contains the APIs to query certain battery info.

Bug: 276399056
Test: robotests
Change-Id: I8f8503f42a6ad1460b4601e44e8b720b91dd13d1
2023-05-19 21:21:46 +08:00
TreeHugger Robot
f3f28ef42d Merge "Avoid hotspot band updates when country code is inactive" into udc-dev am: f6c0e2d4dd am: b381ab48fc am: 1566527a10 am: 1f646b1024
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23341837

Change-Id: Ic95237962aacd5e5260cb10551a0832f51b06602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 09:47:23 +00:00
TreeHugger Robot
1f646b1024 Merge "Avoid hotspot band updates when country code is inactive" into udc-dev am: f6c0e2d4dd am: b381ab48fc am: 1566527a10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23341837

Change-Id: Iee1f2b0536746ca5d955e6c3674e7f9a76c5a05e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 08:59:17 +00:00
TreeHugger Robot
ebea350479 Merge "Avoid hotspot band updates when country code is inactive" into udc-dev am: f6c0e2d4dd am: b381ab48fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23341837

Change-Id: I72f1451a3b7cd370366454c7954f56646e03db8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 08:37:28 +00:00
TreeHugger Robot
1566527a10 Merge "Avoid hotspot band updates when country code is inactive" into udc-dev am: f6c0e2d4dd am: b381ab48fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23341837

Change-Id: Ife422b79a3daf07bdc083730d890873340d42f8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 08:35:34 +00:00
TreeHugger Robot
f6c0e2d4dd Merge "Avoid hotspot band updates when country code is inactive" into udc-dev 2023-05-19 07:40:54 +00:00
Weng Su
8b7e0d7c88 Avoid hotspot band updates when country code is inactive
- The SAP usable channels cannot be queried when the country code is not activated, causing UI to display wrong design

Bug: 280554293
Test: Manual test
atest -c WifiHotspotRepositoryTest

Change-Id: I58e8879438d7a630808aa2c4b69f21eb19968ab1
2023-05-19 12:51:50 +08:00
Daniel Huang
f9aaa71f07 Merge "Use FeatureProvider to provide the firmware update category." into udc-qpr-dev am: e69db09a88 am: dc777ee31a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23260256

Change-Id: I2c7b0566cddd133955dfc52b021d8e185053fb9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 12:59:45 +00:00
Daniel Huang
dc777ee31a Merge "Use FeatureProvider to provide the firmware update category." into udc-qpr-dev am: e69db09a88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23260256

Change-Id: Ic69efc116c521b49d3851b1351aee433f2b34ceb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 11:17:03 +00:00
Weng Su
4c1dd91695 Restrict Printing Settings
- Don't show Printing Settings if the user is restricted by UserManager.DISALLOW_PRINTING

Bug: 269122009
Test: manual test
atest -c PrintSettingsFragmentTest

Change-Id: I15db778ebc4de3c8a76505043fab1ee02db3f290
2023-05-18 18:40:48 +08:00
Daniel Huang
e69db09a88 Merge "Use FeatureProvider to provide the firmware update category." into udc-qpr-dev 2023-05-18 10:27:54 +00:00
danielwbhuang
6189f9fcbd Use FeatureProvider to provide the firmware update category.
1. Add KeyboardSettingsFeatureProvider in FeatureFactory.
2. Use KeyboardSettingsFeatureProvider to add firmware update UI.

Bug: 270114180
Test: manual, atest KeyboardSettingsFeatureProviderImplTest
Change-Id: I62ec7aff71dd5c0d496860363f2c5b3e992503ff
2023-05-18 17:24:43 +08:00
Zoey Chen
7cbd01357a Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53 am: a78c4bff00
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700

Change-Id: I60d5e948ec22819255de9e49597b65b544f254f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 11:21:07 +00:00
Zoey Chen
dfe8a48cab Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53 am: 9752a7be52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700

Change-Id: Ie95a9350cc910aba431e4803b16f063fc32ac8fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 11:21:05 +00:00
Zoey Chen
74ab90bb53 Merge "[Regional Preference] Set numbering system when select it" into udc-dev 2023-05-17 09:44:45 +00:00
Zoey Chen
14c81c17ce [Regional Preference] Set numbering system when select it
Should not return original locale, return the locale which is set unicodeLocaleKeyword instead

Bug: 282879594
Bug: 283036197
Test: atest NumberingSystemItemControllerTest
Change-Id: Ic572f20175ea0428be98f30fe865d826b61dcca6
2023-05-17 05:47:53 +00:00
Yuxin Hu
9dbf6c0fae Merge "Toggle switch back when user dismisses dialog by tapping screen" into udc-dev am: 174bd2ab74 am: 31892d4acd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23220112

Change-Id: I6d22df8ee2f68816796c8440a95ba8895abf15ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 20:13:31 +00:00
Yuxin Hu
f28b2b4b83 Merge "Toggle switch back when user dismisses dialog by tapping screen" into udc-dev am: 174bd2ab74 am: 0b7a88282d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23220112

Change-Id: Iaa26c0dc435ab9b6f32daa9ce49f88234f349162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 20:08:07 +00:00
Yuxin Hu
174bd2ab74 Merge "Toggle switch back when user dismisses dialog by tapping screen" into udc-dev 2023-05-16 18:24:14 +00:00
TreeHugger Robot
e35e12bca5 Merge "[Use] Replace settings LocalePreference with androidx LocalePreference" into udc-dev am: ab32753382 am: b0d27a8b53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23232981

Change-Id: I1cbb4d7e4676e83b28f994b98479fe5c84beb086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 05:18:13 +00:00
TreeHugger Robot
e51a854b93 Merge "[Use] Replace settings LocalePreference with androidx LocalePreference" into udc-dev am: ab32753382
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23232981

Change-Id: I9ba8cd5db9fbcdbee5e4a9a44c278c13bbe89930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 04:32:37 +00:00
TreeHugger Robot
ab32753382 Merge "[Use] Replace settings LocalePreference with androidx LocalePreference" into udc-dev 2023-05-16 03:51:45 +00:00
Yuxin Hu
2cbb587f81 Toggle switch back when user dismisses dialog by tapping screen
The reboot dialog can be dismissed when user:
1) Clicks any button on the reboot dialog
2) Taps any screen area outside of reboot dialog

We want to toggle back the "Enable ANGLE" switch
whenever the user chooses to not reboot the device
immetiately.

This change adds the function to toggle the
"Enable ANGLE" switch back when:
1) User clicks "Cancel" on reboot dialog.
2) User taps screen area outside of reboot dialog
to dismiss the reboot dialog.

Bug: b/270994705
Test: m; flash and device can boot.
atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest

Change-Id: I84fde5ea5bae9d8793bcef30f4c37d832152ae43
2023-05-16 01:58:25 +00:00
TreeHugger Robot
180abfb76f Merge "Fix FaceUpdater.enroll unit test fail in aosp" into udc-dev am: 92e760861d am: 6579137d0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155080

Change-Id: I245bc0f8ede4275028b958458238ba3c3ab9473d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 01:42:14 +00:00
TreeHugger Robot
e12013a755 Merge "Fix FaceUpdater.enroll unit test fail in aosp" into udc-dev am: 92e760861d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155080

Change-Id: I0d76d4228b2ff45202fc428626c0677d87176aec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 00:41:13 +00:00
Chun-Ku Lin
66aff4e01b Merge "Change the settings value and wait for it to propagate." 2023-05-15 21:20:38 +00:00
Chun-Ku Lin
a1fe1ef36e Change the settings value and wait for it to propagate.
**Root cause**
Two reasons of the flaky test:
- Settings value not reset to default after tests
- Need time for the settings value changes to propagate to its listeners

Other clean up: When creating a preference, by default it will store
values in the shared preferences. If we don't intent to save the
preference to the sharedPreferences, we should set presistent as false.

Bug: 279818352
Test: atest
SettingsUnitTests:com.android.settings.accessibility.DisableAnimationsPreferenceControllerTest#onStart_disabledAnimation_shouldReturnTrue
--iterations 50

Change-Id: Ie645f8e847fc8ce188a7e5ed45bf5050f81e1d9a
2023-05-15 19:45:24 +00:00
Zoey Chen
0d1638c3d3 [Use] Replace settings LocalePreference with androidx LocalePreference
Bug: 263861083
Test: atest and manual test
Change-Id: I7af48074278df0b12c83500f0d2b61eb279e70be
2023-05-15 07:28:05 +00:00
Milton Wu
abfb8a5e9d Fix FaceUpdater.enroll unit test fail in aosp
Ignore related tests

Bug: 281627891
Test: atest FaceUpdaterTest
Change-Id: I028a7dd7fd2e56889ac27051678ca954c896da20
2023-05-14 02:57:05 +00:00
Zoey Chen
814bcdc33d Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f am: 34911e336c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017

Change-Id: Ie1affc5347d3bad2da6672efe2faffca5536c0bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 04:34:46 +00:00
Zoey Chen
6d57de3418 Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017

Change-Id: I7b86992ad5572b2c4bd86b1c5935839bceaa1186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 03:54:12 +00:00
Zoey Chen
4d917d990f Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev 2023-05-12 03:37:37 +00:00
Zoey Chen
fb6b6b0bcc [Panlingual] Do not show dialog in recycle. Set LocaleEditor as the
parent fragment and control the dialog.

Keep the dialog and the locale list after rotation

Bug: 279527362
Change-Id: I349fd9d0fea5b43a8bbb2a23fa60fc4c5436c5cf
Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER=LocaleListEditorTest
Test: atest LocaleDialogFragmentTest
2023-05-12 02:40:13 +00:00
Yuxin Hu
4235638174 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366 am: e58d73a958
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: I9741ceb39a659056384baebd1577c0ae142ef084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:06:31 +00:00
Yuxin Hu
37dc9f703c Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: I17ef944bc6163feee27ea59fcde09f9d65bbd37f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 21:43:22 +00:00
Yuxin Hu
6e3aba5366 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev 2023-05-11 20:48:57 +00:00
Yuxin Hu
715a70603c Add AndroidJUnitTest for developer option switch
Bug: b/270994705
Test: m -j45
atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest
atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest

Change-Id: Idbb93458a64894c3eba78a8f9373c40e3ddf35c5
2023-05-11 17:59:21 +00:00