Commit Graph

47742 Commits

Author SHA1 Message Date
menghanli
3fba0ee402 RESTRICT AUTOMERGE 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
(cherry-pick of commit bea25c7513)
2023-02-16 05:59:01 +00:00
Charles Chen
1881749f09 Make Settings show in two-pane on portrait tablet
Test: manual - Change Display size and observe
Bug: 211562623
Change-Id: I0c26a7443882cc28edb5500f8d135c5f00dee515
Merged-In: I0c26a7443882cc28edb5500f8d135c5f00dee515
(cherry picked from commit cf3199fc9e)
2023-02-16 05:32:44 +00:00
Menghan Li
bc25127a18 Merge "Fix certain Accessibility Settings subpages use wrong resources" 2023-02-16 05:26:18 +00:00
TreeHugger Robot
6f90d1afcc Merge "Re-add WiFi Calling preference controller" 2023-02-16 03:42:15 +00:00
Betty Chang
fd32cde5cc Merge "To fix the footer link is not clickable in the Bluetooth Settings" 2023-02-16 02:27:00 +00:00
Aswin Sankar
7807138cb2 Re-add WiFi Calling preference controller
- WiFi calling preference controller was incorrectly removed
from MobileNetworkSettings.
- It was still accessible from Calls & SMS fragment.

Bug: 253698238
Test: Live test by flashing build on Pixel 7
Change-Id: I42b2ca26dfb0bf39ac9a0ec0107f3323d7dfc61b
2023-02-15 18:00:04 -08:00
Anvesh Renikindi
217c026095 Merge changes from topic "update-androidx-ae-tm-qpr-dev" into tm-qpr-dev
* changes:
  Fix build for jetpack update
  Update ActivityEmbedding usage.
2023-02-15 23:35:17 +00:00
Joshua McCloskey
00a2136ffa Dismiss dialog on acquire message event.
Test: Verified that any acquired message dismisses the touch dialog
Fixes: 265502746
Change-Id: I4791edeb9bfdb308778136cd91205560db59f0a8
2023-02-15 18:48:14 +00:00
Henri Chataing
963519a300 Merge "Nfc: Rename system properties in Nfc settings" 2023-02-15 18:36:23 +00:00
Jay Sullivan
6ed8f2b894 Merge "[Safety Labels] Decouple safety label changes from permission rationale" 2023-02-15 18:32:43 +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
changbetty
3512374f62 To fix the footer link is not clickable in the Bluetooth Settings
- Links are not allowed in footer preference title now. So follow the
   Wi-Fi UX design to add the string "Change". Let the user to click and
   go to the Bluetooth scanninng settings

Bug: 265167737
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest

Change-Id: If9e666df7b987e0dbe3d550ac0af03b9d79230de
2023-02-15 14:31:49 +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
Arc Wang
319cac993c Merge "Fix crash when switching Display size" 2023-02-15 11:08:15 +00:00
Philip Junker
6e6a7acbd2 Merge "Use separate SETTINGS_TURN_SCREEN_ON_ACCESS id for TurnScreenOnSettings" 2023-02-15 10:25:31 +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
Arc Wang
ff8c5e0079 Fix crash when switching Display size
Ensure mHighlightMixin is not null before using it.

Bug: 269385877
Test: manual
      Change Display size and observe if Settings crashes.
Change-Id: I9c7ca8d490f7ede6b73d09d51c3e304844e7df0c
2023-02-15 16:03:24 +08:00
Zoey Chen
cf9562beff [Settings] Should remove the subcription listener
Bug: 268405538
Change-Id: Ic96fa0b9a294c3de54cea4b3be52d6f2807c0ada
Test: manual
2023-02-15 06:58:10 +00:00
TreeHugger Robot
3f7cdbf12b Merge "Attach FingerprintEnrollFinishFragment to activity" 2023-02-15 05:04:57 +00:00
Jay Thomas Sullivan
9f8da1f9be [Safety Labels] Decouple safety label changes from permission rationale
Currently the "Safety Label Changes" feature is toggled on only when the
following two feature flags are enabled:

1. safety_label_change_notifications_enabled
2. permission_rationale_enabled

Remove the dependence on "permission_rationale_enabled", so that "Safety
Label Changes" only relies on the
"safety_label_change_notifications_enabled" flag.

Bug: 269330969
Test:  atest PermissionControllerMockingTests:SafetyLabelChangesJobServiceTest; atest CtsPermission3TestCases:SafetyLabelChangesJobServiceTest;atest CtsPermission3TestCases:AppDataSharingUpdatesTest
Change-Id: Ie82bf6a5b6fe1d8cbe6ab58d23085e01c748b5c3
2023-02-15 04:33:38 +00:00
TreeHugger Robot
f2d8b111e0 Merge "[SPA] Move the network folder to spa/" 2023-02-15 03:21:24 +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
Aswin Sankar
eaa2fa8e7a Merge "Remove "Backup Calling" button from Settings UI" 2023-02-15 02:22:56 +00:00
TreeHugger Robot
3ce2b2e85b Merge "Enforce device policy in credential manager (settings)" 2023-02-15 01:23:56 +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
Aswin Sankar
812b59b981 Remove "Backup Calling" button from Settings UI
Pixel will not use 'Backup Calling' setting to enable cross-SIM calling.
Code may live on in aosp for other OEMs.

Revert of 9adfa375ea with changes to
remove lines with "ToDo Deprecate".

Bug:21153988
Test: Live test for cross-SIM calling across both subs.

Change-Id: I90e04ebf9f7bc3a05f459f59775ea7baa18716da
2023-02-14 16:04:50 -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
Becca Hughes
db0ba1ad3d Enforce device policy in credential manager (settings)
Centralizes the provider list generation logic
in CredentialProviderInfo and enforce device
policy. Adds an test API that can be used by
CTS.

Bug: 261978289
Test: ondevice & cts
Change-Id: Idb7d75dc84e1a34025054075bc78b3c3d06f130f
2023-02-14 18:47:00 +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
Zoey Chen
e6b32b7d3d [SPA] Move the network folder to spa/
Bug: 268144349
Test: manual
Change-Id: I97dcd047a35ff94f5f6bb7c304a81679f72b10a4
2023-02-14 11:39:18 +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
Prabal Singh
98c33afa77 Merge "Remove Advanced Privacy Settings screen" 2023-02-14 09:18:05 +00: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
44b02abb2a Merge "Redirect AdvancedSecuritySettings to MoreSettings" 2023-02-14 08:47:22 +00: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
TreeHugger Robot
88c0769ef7 Merge "Biometrics v2 RFPS enrolling refine" 2023-02-14 05:54:44 +00:00
Milton Wu
f7845d823b Biometrics v2 RFPS enrolling refine
1. Fix back key in enrolling page
2. Fix 0.5 sec black screen if user presses skip

Bug: 260957939
Test: atest FingerprintEnrollmentActivity
Change-Id: If5308246ed380c2e3dd12f19f13aa38fc8c178a8
2023-02-14 11:15:16 +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
Automerger Merge Worker
a733c64a58 Merge "Merge "Show Bluetooth dialog in a specific case" am: e1e657dac3 am: 420a8474db am: c6cbe0b6ac" 2023-02-14 02:55:50 +00:00