Commit Graph

18877 Commits

Author SHA1 Message Date
Menghan Li
bc25127a18 Merge "Fix certain Accessibility Settings subpages use wrong resources" 2023-02-16 05:26:18 +00:00
Derek Jedral
eb08a84437 Merge "Show CombinedBiometric if active unlock enabled" 2023-02-15 18:03:55 +00:00
Behnam Heydarshahi
b5ecd4b87d Merge "Propagate mute event to both ring volume slices" into tm-qpr-dev am: d89de47399 am: 3ee4929594
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21339549

Change-Id: Icca1292b29dc7682c36d901bce41d08f5ae3ab7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 16:09:19 +00:00
Behnam Heydarshahi
d9c3cf855f Muting ring volume slider disables notification
With volume_separate_notification flag enbaled, muting ring volume
slice will cause notification volume slice to gray out.

There used to be a bug in which notification slice would not get
updated in response to a change in ring volume mute/unmute broadcast.
The resulting erroneous behavior was notification slider would get to
zero but not get grayed out. To fix that bug, VolumeSliceHelper listens
to ring stream mute/unmute broadcasts and forwards them to notification
slice.

Bug: b/266072907
Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER="NotificationVolumePreferenceControllerTest|VolumeSliceHelperTest" RunSettingsRoboTests -j40

Change-Id: I2ab51f1272bf99a0c3d9ca285354052d00910c90
2023-02-15 15:43:08 +00:00
Neil Fuller
ddbbcbab5b Merge changes Ifd96c543,I1a0faa44
* changes:
  Further status logic tweaks
  Tweak status display logic and tests
2023-02-15 15:15:21 +00:00
Behnam Heydarshahi
3ee4929594 Merge "Propagate mute event to both ring volume slices" into tm-qpr-dev am: d89de47399
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21339549

Change-Id: If4cfdeb37dbcc49ce9ec36bee690df4db1a87213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 15:08:56 +00:00
Behnam Heydarshahi
d89de47399 Merge "Propagate mute event to both ring volume slices" into tm-qpr-dev 2023-02-15 14:28:15 +00:00
Bonian Chen
e47ba046ac Merge "[Settings] IMEI should be enabled regardless existance of SIM" 2023-02-15 12:22:15 +00:00
Bonian Chen
535b518ac9 [Settings] IMEI should be enabled regardless existance of SIM
Force IMEI fields always enabled.

Bug: 266877869
Test: auto

Change-Id: Ic164b3c171fd673cfb02d9973d4c210585198707
2023-02-15 10:16:36 +00:00
Alex Johnston
97658e3a1f Merge "Implement OP_SYSTEM_EXEMPT_FROM_POWER_RESTRICTIONS exemption" 2023-02-15 09:37:12 +00:00
TreeHugger Robot
3f7cdbf12b Merge "Attach FingerprintEnrollFinishFragment to activity" 2023-02-15 05:04:57 +00:00
menghanli
af1f8ed6ad Add a done button to vision setting pages in setup flow am: 991b70c720
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21414425

Change-Id: Ibb2f4831810685728481e6a9ba5073c3252b9968
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 02:33:03 +00:00
Xin Li
65d9917e8a RESTRICT AUTOMERGE - Merge TQ2A.230305.008
Bug: 264720040
Merged-In: Id3ebc6627d6b46172cae1ce9e5c7500a652e719d
Merged-In: I8b9a2cbd5af7fa1bba56ff9ba62771d677d4a932
Change-Id: I5833464626eb06a01d6979c477be98ba06827893
2023-02-14 16:31:37 -08:00
menghanli
991b70c720 Add a done button to vision setting pages in setup flow
Root cause: User feels confused because the particular screen doesn't have a back button but at that moment of the setup flow the regular UI gestures didn't even work.
Solution: Add a done button to the vision settings pages for clearer navigation. This change combines parts of commit 5e931b2c23 and commit dd2ec775c8.

Bug: 262995569
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FragmentForSetupWizardTest
Change-Id: Id3a0d78389e0e6c11b5b5cf016b37673fde7f286
Merged-In: Id3a0d78389e0e6c11b5b5cf016b37673fde7f286
(cherry picked from commit dd2ec775c8)
2023-02-15 06:32:57 +08:00
Derek Jedral
4d32e70a60 Show CombinedBiometric if active unlock enabled
We want to show this page as long as active unlock is enabled. The
underlying check of isAvailable checks if the appropriate biometrics are
available and updates the title accordingly.

Test: manual test, confirm combined page appears when active unlock on
Test: atest BiometricsSafetySourceTest
Bug: 264812908
Change-Id: I5da1c20d65b879751bdd615c14c2f8a71cc54d80
2023-02-14 22:24:25 +00:00
Josep del Río
282b5201a7 Merge "Use InputSettings in Settings app" 2023-02-14 17:18:40 +00:00
TreeHugger Robot
8fe240626a Merge "[Regional Preference] Append unicode tags to new system language." 2023-02-14 13:47:59 +00:00
tom hsu
d68e04ff04 [Regional Preference] Append unicode tags to new system language.
-When the user adds a new system language, this new language can not
 have the current unicode tags. Hence, it shall append current unicode tags to the new system language.

Bug: b/268025290
Test: Manual test passed.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=LocaleListEditorTest
Change-Id: I76671908ad01dcb8b04714aa3ca44d3614a0428b
2023-02-14 12:20:57 +00:00
Milton Wu
211313b52d Attach FingerprintEnrollFinishFragment to activity
Start FingerprintEnrollFinishFragment when enrolling page is done.

Bug: 260960831
Test: atest FingerprintEnrollmentActivityTest
      FingerprintEnrollmentViewModelTest
Change-Id: Ia751c20330dfdcac91e961acc70aa033b05de03f
2023-02-14 19:18:56 +08:00
menghanli
bea25c7513 Fix certain Accessibility Settings subpages use wrong resources
Root cause: Portrait mode does not always respect the sw600dp qualifier and instead uses the phone (default) resources.
Solution: Using the product to customize the tablet and phone cases is better way than using the configuration qualifier.

Bug: 269130587
Test: Manual testing
Change-Id: I90cc44f1e9bccf8950a4d89f70119ba5e3c0bfdc
2023-02-14 17:13:36 +08:00
Prabal Singh
402f1d0f73 Merge "Merge Advanced Security and Privacy Category keys" 2023-02-14 08:47:13 +00:00
Jason Hsu
b93d5f183b Merge "[Audio Routing] Add audio routing functionality for hearing device" 2023-02-14 08:00:05 +00:00
jasonwshsu
31ff5d92d1 [Audio Routing] Add audio routing functionality for hearing device
* 'Ringtone', 'Call', 'Media', 'System sounds' routing capability for hearing device

Bug: 269122580
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingDeviceAudioRoutingBasePreferenceControllerTest
Change-Id: Id43b2323740bfa40c36f74dec644c00695f414c3
2023-02-14 14:45:31 +08:00
Menghan Li
42e131a199 Merge "Add a done button to vision setting pages in setup flow" 2023-02-14 03:09:12 +00:00
TreeHugger Robot
834dda9105 Merge "Add persistent MTE toggle to development options." 2023-02-14 02:40:01 +00:00
menghanli
dd2ec775c8 Add a done button to vision setting pages in setup flow
Root cause: User feels confused because the particular screen doesn't have a back button but at that moment of the setup flow the regular UI gestures didn't even work.
Solution: Add a done button to the vision settings pages for clearer navigation.

Bug: 262995569
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FragmentForSetupWizardTest
Change-Id: Id3a0d78389e0e6c11b5b5cf016b37673fde7f286
2023-02-14 08:41:46 +08:00
Xinyi Zhou
19e792ae4b Merge "Revert "Revert "Delete Fast Pair Settings""" 2023-02-13 19:58:23 +00:00
Neil Fuller
37996acd7c Further status logic tweaks
Change the SettingsUI logic slightly: All other things being equal, pick
the "worst" location dependency status to show. Some renaming and
annotations for clarity.

Also fixes the mocking behavior in the tests around resources, which
were accidentally using the real strings and therefore dependent on real
resource string values. Tests are made more explicit.

Bug: 266921482
Test: atest tests/robotests/src/com/android/settings/datetime/LocationProviderStatusPreferenceControllerTest.java
Change-Id: Ifd96c543dad692884be23bf94e3f1294eed291d5
2023-02-13 15:03:32 +00:00
Neil Fuller
fc4f2ce81d Tweak status display logic and tests
The existing logic and tests looks incorrect. Tests have been tidied up
to reflect real cases. For example, it's not really possible for the
provider to report being "blocked", but for it to report it is "certain"
at the same time.

Bug: 266921482
Test: atest tests/robotests/src/com/android/settings/datetime/LocationProviderStatusPreferenceControllerTest.java
Change-Id: I1a0faa44ed7dd09828ff758db9e40f5d5e010ab0
2023-02-13 15:03:15 +00:00
Behnam Heydarshahi
236bbcb8bc Propagate mute event to both ring volume slices
Fix a bug where introduction of a separate_ring_volume slice meant that
the original ring_volume slice would not get notified of ring stream
muting event.

Bug: b/266855922

Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=VolumeSliceHelperTest RunSettingsRoboTests -j40
Change-Id: Ifb5ebe4e7d9bde3d14336891cce3fbee167a5911
2023-02-13 14:50:27 +00:00
Jakub Rotkiewicz
2a82a4f3b1 Merge "SnoopLogger: Debug enhancements added settings" am: cfde422f91 am: bd2f353f8b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2362495

Change-Id: I948bc2e08e3044d20a9d3ce5b081c940bea54811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-13 14:19:30 +00:00
Jakub Rotkiewicz
bd2f353f8b Merge "SnoopLogger: Debug enhancements added settings" am: cfde422f91
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2362495

Change-Id: I3c138106ebdaaf6b5597c6a79054915a04098117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-13 13:35:37 +00:00
Jakub Rotkiewicz
cfde422f91 Merge "SnoopLogger: Debug enhancements added settings" 2023-02-13 13:01:01 +00:00
Bonian Chen
0996decc69 Merge "[Settings] User restriction should be applied" 2023-02-13 12:38:41 +00:00
Jakub Rotkiewicz
5a1b8a11a6 SnoopLogger: Debug enhancements added settings
Bug: 247859568
Tag: #feature
Test: make RunSettingsRoboTests3
Test: make RunSettingsRoboTests4

Change-Id: I132a1558ea67400d9c10dda523456f99eb815b92
Merged-In: I132a1558ea67400d9c10dda523456f99eb815b92
2023-02-13 11:35:55 +00:00
Jakub Rotkiewicz
dce72966fb Merge "SnoopLogger: Debug enhancements added settings" 2023-02-13 11:29:16 +00:00
Bonian Chen
ceaa5cd7ae [Settings] User restriction should be applied
Simply verify isAdminUser() could be insufficient, since there're some
other use cases (such as managed device).

Bug: 228079419
Test: local

Change-Id: Ic9f27deafada31dacef03e27bf02ecbc9a8b3231
2023-02-13 09:04:04 +00:00
jasonwshsu
642380410d Fix fail test case in FlashNotificationsUtilTest
* Update correct code for ScreenFlashNotificationColor.AZURE

Bug: 237628564
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FlashNotificationsUtilTest
Change-Id: I10a3106ab140192841a703b50763a1d2e6b1c0d0
2023-02-13 01:52:37 +08:00
TreeHugger Robot
34b7835a50 Merge "Hide "no thanks" button when enrollment completed." 2023-02-11 02:34:19 +00:00
Tyler Freeman
35def91fcc Merge "feat(#MagnificationJoystick): add preference for enabling Joystick to Settings" 2023-02-11 01:04:00 +00:00
Tyler Freeman
43d5042ff9 feat(#MagnificationJoystick): add preference for enabling Joystick to Settings
Hide behind feature flag so no one sees the preference unless its enabled.

Bug: b/265688847

Test: atest MagnificationJoystickPreferenceControllerTest

Change-Id: Id5cc9385f25395f53809a79ba70c84205f9758c2
2023-02-10 19:19:11 +00:00
Josep del Rio
8411d1c663 Use InputSettings in Settings app
At the moment the settings app will make use of certain exposed
functions in InputManager that are being moved to a separate
class. This CL migrates those usages to the new internal API.

Bug: 267758905
Test: compiles, and should pass presubmit
Change-Id: I30dcb83aa1cc8830650fe856775a462ed37c2dda
2023-02-10 16:37:49 +00:00
Alex Johnston
2747dc6e8c Implement OP_SYSTEM_EXEMPT_FROM_POWER_RESTRICTIONS exemption
OP_SYSTEM_EXEMPT_FROM_POWER_RESTRICTIONS details:
* An app with this appop will be made exempt from all
  power restrictions, including app standby and doze.
* In addition, the app will be able to start fgs from
  the bg, and the user will not be able to stop fgs
  run by the app.

Changes:
* Implement the OP_SYSTEM_EXEMPT_FROM_POWER_RESTRICTIONS

Bug: 246330879
Test: atest PowerAllowlistBackendTest

Manual testing:
- Give OP_SYSTEM_EXEMPT_FROM_POWER_RESTRICTIONS appop to TestDPC app
- Verify the app can start fg services from the bg
- Verify fgs started by the app cannot be stopped
- Verify the app cannot be put into background restricted via Settings

Change-Id: If9e76076c59195f1e6e5f3eee3c8e7a0c754d8de
2023-02-10 13:37:38 +00:00
Jakub Rotkiewicz
934b0bb739 SnoopLogger: Debug enhancements added settings
Bug: 247859568
Tag: #feature
Test: make RunSettingsRoboTests3
Test: make RunSettingsRoboTests4

Change-Id: I132a1558ea67400d9c10dda523456f99eb815b92
2023-02-10 09:59:52 +00:00
jasonwshsu
68ffe47f08 Fix BluetoothPairingDetailTest fail
Bug: 237625815
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothPairingDetailTest
Change-Id: I183fea9903cad921f7fe69445579b80dea045559
2023-02-10 09:47:22 +00:00
Tom Hsu
d3ff83eb4f Merge "[Regional Preferences] Remove u extension for subtitle of Language" 2023-02-10 03:57:51 +00:00
Hao Dong
54003698b1 Do not show udfps enrollment page in multi window mode.
In multi window mode, finish FingerprintEnrollEnrolling activity
and show a toast.

Test: atest FingerprintEnrollEnrollingTest
Bug: 184118847
Change-Id: I8cfa61b334c029185e1bbf46fdbf158bb493a1e0
2023-02-10 01:30:30 +00:00
Daniel Norman
56f1eb0fbf Merge "Adapt to moved ACCESSIBILITY_MENU_IN_SYSTEM location." 2023-02-09 23:05:18 +00:00
Florian Mayer
5b93b73df1 Add persistent MTE toggle to development options.
Bug: 245624194
Change-Id: I83283eb74360ec0eccd6b236b42eb987a580ec2c
2023-02-09 13:26:27 -08:00
yw.bae
f763c25c1e Implement Flash Notifications UI for Settings app.
Bug: 237628564
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CameraFlashNotificationPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ColorSelectorLayoutTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FlashNotificationsPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FlashNotificationsPreferenceFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FlashNotificationsPreviewPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FlashNotificationsPreviewPreferenceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FlashNotificationsUtilTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ScreenFlashNotificationColorDialogFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ScreenFlashNotificationColorTest
Change-Id: I0987590ddfcfd0873ec419db263f6a7eade81844
Signed-off-by: yw.bae <yw.bae@samsung.corp-partner.google.com>
Signed-off-by: Angela Wang <angelala@google.com>
2023-02-09 21:00:50 +08:00