Commit Graph

119857 Commits

Author SHA1 Message Date
Derek Jedral
001aae8dfe Merge changes from topic "au-initial-commit-master"
* changes:
  Update text when Active Unlock is enabled.
  Update tile summary from ContentProvider.
  Add Active Unlock tile under face & fingerprint
  Add ActiveUnlock check when picking preference
2023-01-31 03:24:22 +00:00
Derek Jedral
7e524288b5 Add strings for active unlock in settings
Add strings that active unlock needs to consume when surfacing itself in
combined biometrics settings.

Test: none, strings aren't consumed yet.
Bug: 266583888
Bug: 240437016
Change-Id: I41e3b9c1830212303fc3379462e80cb18a23d026
Merged-In: I41e3b9c1830212303fc3379462e80cb18a23d026
2023-01-30 18:17:32 -08:00
Derek Jedral
053a9f8947 Route to active unlock component
Update onRetryPrefenceTreeClick to check for the active unlock
preference. If biometrics are not enrolled and we're using the
biometric failure model, launch the biometric setup flow. Otherwise,
launch the  component directly.

Test: manual flag flip, confirm activity launches
Bug: 266441818
Change-Id: I8f3ce8f8366b65aad622d33ff7f99f5c82aae3e8
2023-01-30 16:48:52 -08:00
yuanjiahsu
06466b030b Implement “Set up Face or Fingerprint Unlock first” page
The activity which instructs the user to set up face or fingerprint unlock before setting the watch unlock

Bug: 264813445
Bug: 264962961
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ActiveUnlockRequireBiometricSetupTest
Change-Id: I556c62b6b8102f6e15045a37cf506c0c0eedf733
2023-01-30 16:48:52 -08:00
Derek Jedral
9134f24f31 Update text when Active Unlock is enabled.
Update the security summary, intro, and unlock your phone summary when
Active Unlock is enabled and enrolled on the device.

Test: make RunSettingsRoboTests
Test: manually flip flags, confirm combined page has updated strings
Bug: 264812018
Change-Id: I2843e9f3aa0f38a9f2ebb18d60fed6293f9ce36e
2023-01-30 16:48:52 -08:00
Derek Jedral
334e48f4ff Update tile summary from ContentProvider.
A subscription is created and destroyed based on the lifecycle events.
Fetching the summary is done asynchronously to prevent blocking the UI
thread.

Test: make RunSettingsRoboTests
Test: manually flip flags, confirm tile has dynamic summary
Bug: 264812018
Change-Id: Ib1149ec6907b6a70226c36d37431023aaf6ad557
2023-01-30 16:48:44 -08:00
Treehugger Robot
664ffc63fa Merge "Fixes resource file exemption." am: 888759dd9f am: b6050b438d am: b1963ab733
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2395652

Change-Id: I42e717ae98f2427bdf92be78e46be9ab15666ee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-30 23:21:06 +00:00
Treehugger Robot
b1963ab733 Merge "Fixes resource file exemption." am: 888759dd9f am: b6050b438d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2395652

Change-Id: Idf4f02ff98d516d42e48e372bac9455386247906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-30 22:20:06 +00:00
Treehugger Robot
b6050b438d Merge "Fixes resource file exemption." am: 888759dd9f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2395652

Change-Id: I36b5629352f9dcff89dc387e50e77d1eed083ad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-30 21:36:22 +00:00
Treehugger Robot
888759dd9f Merge "Fixes resource file exemption." 2023-01-30 20:28:12 +00:00
Derek Jedral
d3d08609d3 Add Active Unlock tile under face & fingerprint
This tile will eventually link to GmsCore. It only shows up for non-work
profile face & fingerprint pages. Its visibility depends on both whether
the corresponding GmsCore component is enabled, as well as the feature
flag.

Test: make RunSettingsRoboTests
Test: manually flip flags, confirm tile shows in combined biometric page
Bug: 264813301
Change-Id: Ieea53f00e46cfbfe87e3b31756f64f299b7d3174
2023-01-30 12:11:12 -08:00
Derek Jedral
d828e0abf5 Add ActiveUnlock check when picking preference
Modify BiometricsSettingBase to also track if the hardware is supported
and if the controller is a work profile controller. If the hardware is
supported and active unlock is enabled, non-work profile controllers
will still be displayed.

Test: make RunSettingsRoboTests
Test: manually flip flags on device with active unlock, confirm new
layout used
Bug: 264813302

Change-Id: Idb0e994453d4fd5c078c45f87d5d8cee339053a2
2023-01-30 12:11:07 -08:00
TreeHugger Robot
c88ad2f866 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6b55b6c07a -s ours am: da5b93a2ac -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21128395

Change-Id: Ib39fba4ad9e6b57c993b21cf83e1a4eda96b5a1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-30 18:49:50 +00:00
Bill Yi
4cb19759f8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72a66bbf28 -s ours am: a60cc4b92f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21128395

Change-Id: Iade46c513ff2f0dc36da1686c91491c910744bc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-30 18:49:44 +00:00
Julia Reynolds
64a8c5aa43 Merge "Standardize colors in privacy dialogs" 2023-01-30 18:34:05 +00:00
Julia Reynolds
1eb3dae347 Merge "Update icon sizing" 2023-01-30 18:33:02 +00:00
TreeHugger Robot
da5b93a2ac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6b55b6c07a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21128395

Change-Id: I8d1a053931f09b1be50630d1bc943c37110a000a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-30 18:12:36 +00:00
Bill Yi
a60cc4b92f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72a66bbf28 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21128395

Change-Id: Ie4f6c55d788b07a6cc1fb7d6f6ea10012aede46f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-30 18:12:03 +00:00
Valentin Iftime
3f4a52c6e5 Fix notification settings bottom sheet scroll in landscape am: 1e81f6eb95 am: 64d45c576e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21142898

Change-Id: I51f151b66d1c2d1138e296786d9f2853b0e81c4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-30 17:47:25 +00:00
TreeHugger Robot
6b55b6c07a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-01-30 17:44:51 +00:00
Valentin Iftime
64d45c576e Fix notification settings bottom sheet scroll in landscape am: 1e81f6eb95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21142898

Change-Id: I46a70404c8a2032ae605ba7bbdb95a6b04be728b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-30 17:08:32 +00:00
Avinash Vadlamudi
9db8584acf Merge "[Auto Pin Confirm]: Changes to allow PIN auto confirm feature to be controllable by the user" 2023-01-30 17:04:29 +00:00
Valentin Iftime
1e81f6eb95 Fix notification settings bottom sheet scroll in landscape
Fix layout size and configuration listener for landscape orientation.

Test: adb shell cmd notification post "Test notif" &
    adb shell am start -a android.settings.CHANNEL_NOTIFICATION_SETTINGS     --es android.provider.extra.CHANNEL_FILTER_LIST "sound"     --es android.provider.extra.CHANNEL_ID "shell_cmd"     --es android.provider.extra.APP_PACKAGE "com.android.shell
Bug: 238845213
Change-Id: I6c2ba149cddfdf35292b0b6fc92c0d8418a86c54
2023-01-30 15:14:54 +00:00
TreeHugger Robot
f253dc391f Merge "Make Accessibility Settings can support Relate project in Speech category" 2023-01-30 14:40:56 +00:00
Avinash Vadlamudi
4c8ad8f911 [Auto Pin Confirm]: Changes to allow PIN auto confirm feature to be controllable by the user
- Add SwitchPreference to allow user to control the pin auto confirm feature
- Add Checkbox option during the PIN setup in Security app
- Disable the opt-in checkbox during SUW entry point for PIN setup
- Update SwitchPreference availability appropriately according to current PIN length
- Update the pin_auto_confirm setting appropriately according to state of switchPreference or checkbox state (in PIN setup)
- Update the error-message when PIN Too short to let user know six digit is recommended

Bug: 262926000
Bug: 262936383
Bug: 262934702
Bug: 262935305
Test: Manual Test
Test: atest SettingsRoboTests
Change-Id: Ib9e09bd5ce44652158e77f80e8be19c4dd50f3bf
2023-01-30 14:35:41 +00:00
TreeHugger Robot
51357872de Merge "Fix test failure of ScreenOnTimeControllerTest" 2023-01-30 07:50:22 +00:00
TreeHugger Robot
2359087160 Merge "Launch the correct profile for the App Info items" 2023-01-30 07:43:32 +00:00
Zaiyue Xue
59b863ea73 Fix test failure of ScreenOnTimeControllerTest
Bug: 265364490
Fix: 265364490
Test: presubmit
Change-Id: Ia3b371091d45a006733585370ef0cfc6d6c8a83a
2023-01-30 14:41:22 +08:00
TreeHugger Robot
f8ddd05a85 Merge "Make BiometricsViewModelFactory Java 8 compilable" 2023-01-30 04:04:56 +00:00
Chaohui Wang
27e5019790 Make BiometricsViewModelFactory Java 8 compilable
Bug: 260441791
Test: Make Settings
Change-Id: I4d2e80a29bb50fe49d0c19030058bf5951b80a80
2023-01-30 10:45:05 +08:00
Chengfei Tao
b5e5100f92 Adjust AlwaysExpand List so that face detail settings will show in side panel
while posture guidance will show full-screen

Test: Manual testing with power cycle
Bug: 263068723
Change-Id: I6d632d08dcb3597cd8470f8d3d34258e4280dc14
2023-01-30 10:17:04 +08:00
Prabal Singh
e7b9d04222 Add support for Biometrics for work Source for SC
Fixes: b/266818876
Fixes: b/238870897
Test: manually tested
Change-Id: I674b89226c445399dea69e4355b124f376e7f38d
2023-01-29 04:40:05 +00:00
Chaohui Wang
c1726d07e5 Launch the correct profile for the App Info items
Use the app user handle when SubSettingLauncher launch the new page, to
make sure the new page is opened for the correct profile.

Bug: 236346018
Test: Unit test
Test: Manually with App Info Setting page
Change-Id: Idd6eb183e967b1ced10fcf46b9e74bdff3953280
2023-01-29 01:10:47 +08:00
Chaohui Wang
608a9934f7 Move product specific strings to res-product
Move the followings,
- security_settings_fingerprint_enroll_finish_v2_message
- security_settings_fingerprint_enroll_finish_v2_add_fingerprint_message

Product specific strings need to be put in res-product.

Bug: 250807976
Test: Make Settings
Change-Id: I6928c8d126bb91456f3b2214e85cab8b6608f532
2023-01-28 22:36:11 +08:00
Bill Yi
72a66bbf28 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If0994989dc0ca9781b9cce2543977117050691a3
2023-01-27 14:18:04 -08:00
Treehugger Robot
1e45ac1330 Merge "Add mtv engineers to owners for emergency code reviews" am: 3272025234 am: f706f0fc0f am: fc8edace62
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2404300

Change-Id: I96180d5b091e7274bc120864bfdb1ec31178e013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 21:58:42 +00:00
Julia Reynolds
3bab3c429c Make pre-upgrade footer appear more consistently
It's useful info regardless of whether the NLS is enabled

Test: PreUpgradePreferenceControllerTest
Fixes: 233963916

Change-Id: Idc6b2cebe18b119052233775bd4dcd561fd8b4fa
2023-01-27 16:49:42 -05:00
Julia Reynolds
a50c0b9636 Update icon sizing
Fixes: 233087471
Test: BridgedAppsPreferenceControllerTest, view 'see all apps' screen
Change-Id: I1090f2461f22bf87f20de969d1a0c5b8c2c6b7b7
2023-01-27 21:18:33 +00:00
Treehugger Robot
fc8edace62 Merge "Add mtv engineers to owners for emergency code reviews" am: 3272025234 am: f706f0fc0f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2404300

Change-Id: I80de049254f8ae4503a137cccf466dd984873b6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 21:15:59 +00:00
Julia Reynolds
61f2273cb0 Standardize colors in privacy dialogs
Test: view a11y and NLS 'do you want to turn this on?' dialogs
Fixes: 222858822
Change-Id: I2a6ada183da71689ca6f31d57c0da711196cadd5
2023-01-27 15:33:10 -05:00
Treehugger Robot
f706f0fc0f Merge "Add mtv engineers to owners for emergency code reviews" am: 3272025234
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2404300

Change-Id: I50416ec05b1f205986f48fa3635190ec9f48a64d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 20:25:55 +00:00
Florian Mayer
6a091f7598 Merge "Revert "[MTE] Move toggle to dev options"" 2023-01-27 19:34:54 +00:00
Treehugger Robot
3272025234 Merge "Add mtv engineers to owners for emergency code reviews" 2023-01-27 19:21:59 +00:00
TreeHugger Robot
c54584127b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4591a191e1 -s ours am: e617406b8d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21121349

Change-Id: I473165263d0379243128be343727764d2a5f1ae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 08:22:38 +00:00
Bill Yi
1cddc22f0a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f0104105fe -s ours am: e1a54f8968 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21121349

Change-Id: I22f0d36ecef77f57190853ad79f615fbaee4cd1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 08:22:33 +00:00
TreeHugger Robot
e617406b8d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4591a191e1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21121349

Change-Id: Ieb915ee324738c57efaf2e4e61f968d555f90b68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 07:51:18 +00:00
Bill Yi
e1a54f8968 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f0104105fe -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21121349

Change-Id: I6dd5ec9eb1a9c88145ec78b296e4df736edf9b33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 07:51:01 +00:00
TreeHugger Robot
4591a191e1 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-01-27 06:57:01 +00:00
Stefan Andonian
ec6fd4c353 Merge "Move ViewCapture On/Off controls to QuickSettings Tile." into tm-qpr-dev am: d0e6bddbc5 am: 98d219cd2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20872948

Change-Id: Icd6904a71918a0c25a49fbbc6fff4ce06d6333d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 05:54:58 +00:00
Yang Lu
b9862e79df Add mtv engineers to owners for emergency code reviews
Change-Id: I440120397c11b8ebce617649c700b63dbca30ee8
Test: N/A
2023-01-27 05:21:25 +00:00