Commit Graph

1905 Commits

Author SHA1 Message Date
Treehugger Robot
24e5321dfb Merge "Move DisplayDataSizeTest to AndroidJunitTest" 2023-06-07 01:25:28 +00:00
Chun-Ku Lin
24b045c987 Move DisplayDataSizeTest to AndroidJunitTest
**Root cause**
- When DisplayDataSizeTest was created, it was ignored already due to
b/214161063. That means the test never passed in the beginning.

- The default display's type in Robolectric is TYPE_UNKNOWN. However, in
the constructor of DisplayDensityUtils, we check all the display that is
not TYPE_INTERNAL can't be a default display. Hence the test failed.

- Even if we shadow the DisplayInfo to have TYPE_INTERNAL for default
  display, the test still failed, because whenever we tried to get the
  default display density we always get 0, and doens't have other diplay
  density values. Hence we can't test increasing the display size in
  Robolectric Test.

Note: the solution here is a workaround for waiting AsyncTask to finish.
If we ever change the implementation in DisplayDensityUtils to not use
AsyncTask, we'll need to update the test.

Bug: 279082331
Test: atest DisplaySizeDataTest --iterations 20

Change-Id: I3ccee5e7ba4d9399a8b715d84a9d53e106f88762
2023-06-07 00:06:48 +00:00
Treehugger Robot
13c488fc3c Merge "Use custom action key icon" into udc-qpr-dev am: dbec7ba7fb am: 065885622b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23369343

Change-Id: I938c2414fec70253fa4c38f8e5959d04e121e2d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 18:36:44 +00:00
Treehugger Robot
dbec7ba7fb Merge "Use custom action key icon" into udc-qpr-dev 2023-06-05 16:56:35 +00:00
TreeHugger Robot
4834abe241 Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: f0503e2a51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: I763e30e24d32f456b30bf174eeacc899149b0ffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 22:23:17 +00:00
TreeHugger Robot
701610cd39 Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0cf0 am: ac91d63f00
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23466978

Change-Id: I240fa0143b223161965c470d6eaae678c0133026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 22:21:54 +00:00
danielwbhuang
19a5e212de Use custom action key icon
1. get icon from getKeyboardSettingsFeatureProvider
2. set color for it

Bug: 269214138
Test: manual, atest KeyboardSettingsFeatureProviderImplTest
Change-Id: I3a2d47e8230aec1404300b000e8b1fcf221e2a65
2023-05-29 15:38:55 +08:00
Weng Su
25d259e3e2 Restrict SimDialogActivity
- Restrict UI if user is a guest

- Restrict UI if user has DISALLOW_CONFIG_MOBILE_NETWORKS

Bug: 262242946
Bug: 271849181
Test: manual test
atest -c SimDialogActivityTest

Change-Id: I227400aa71880895d8356f3d2961cb610ad2a357
2023-05-29 07:03:19 +00:00
Treehugger Robot
67b9234806 Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc am: 24db1f3393 am: 424440670d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: Ib5975d1e338250b7468f3e37650094eeb5244bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 20:20:34 +00:00
Treehugger Robot
eff0680f84 Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc am: 24db1f3393 am: f483a19888
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: Ib4a95a02a1ab9dae837d795c3721f0357746a395
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 20:17:44 +00:00
Treehugger Robot
24db1f3393 Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: Ifa1155d2a3ae19ff743b29b47e088d5d42724f70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 17:44:20 +00:00
Milton Wu
38215ed045 Merge "[BiometricsV2] Refine fingerprint activities" 2023-05-26 04:17:27 +00:00
Yuxin Hu
d8fbd089d8 Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb am: f783947615
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519

Change-Id: I7d2cfa1bb297eab9ff0b06ed10d628153ae1c40c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 19:48:28 +00:00
Yuxin Hu
e7c3c0fa70 Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb am: b67e1d5371
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519

Change-Id: I6f25d8783e9c94335bd8f58c969b8e14c82f9147
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 19:45:48 +00:00
Chun-Ku Lin
750cf98095 Merge "Use ResourcesUtils to get the resource from the target application." 2023-05-25 18:32:45 +00:00
Yuxin Hu
67c72c01cb Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev 2023-05-25 18:08:10 +00:00
Treehugger Robot
506b8af1b1 Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb am: 0d065f7913
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373

Change-Id: I0ba5cc6eb2112440a4b2063f1347fed9406f5ad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 07:33:25 +00:00
Treehugger Robot
d243b12da5 Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb am: 1d2e2d318b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373

Change-Id: Ia1e552464e510c823c59c3ad11d8bf7994634551
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 07:27:55 +00:00
Milton Wu
bc2dbee762 [BiometricsV2] Refine fingerprint activities
Seperate FingerprintEnrollmentActivity to another InternalActivity and
SetupActivity. InternalActivity is used for FingerprintSettings.
SetupActivity is used for setupwizard flow.

Bug: 284248001
Test: atest FingerprintEnrollmentActivityTest
Test: atest for biometrics/biometrics2 in unit tests
Test: settingRoboTest for biometrics
Change-Id: I9fb5dc34300060b9ccf857a3335b81a5d4bf5c7b
2023-05-25 06:25:58 +00:00
Treehugger Robot
1fd77775cb Merge "[Settings] Use background thread to get VoNr state." into udc-dev 2023-05-25 06:25:55 +00:00
Chun-Ku Lin
fbadd2889f Use ResourcesUtils to get the resource from the target application.
Bug: 284220081
Test: atest OneHandedPreferenceControllerTest
Change-Id: I25558af0c797dfc0a5fdd3cff6f1724ff18dac27
2023-05-25 04:37:50 +00:00
tom hsu
97a1fc643e [Settings] Use background thread to get VoNr state.
- TelephonyManager#isVoNrEnabled may not send back the result in time,
   so use different thread and timer to prevent ANR.

Bug: 282876876
Test: atest passed
Change-Id: Ie6cc0f8a459f5ebed930e457dacb9b742df70fad
2023-05-25 10:56:03 +08:00
Chun-Ku Lin
9849bce398 Merge "Unified service and shortcut state summary on a11y settings page." 2023-05-24 22:21:26 +00:00
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
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
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
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
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
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
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
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
ab32753382 Merge "[Use] Replace settings LocalePreference with androidx LocalePreference" into udc-dev 2023-05-16 03:51:45 +00:00