Commit Graph

119676 Commits

Author SHA1 Message Date
Derek Jedral
999372caf4 Fix NPE with registering content listener
1) Fix the condition to check either subscribed or null.
2) Don't register listeners unless the feature flag is enabled

Test: make RunSettingsRoboTest
Bug: 267357231
Change-Id: I0134812cbac60c394d96c5a5621a7c16d781b05d
2023-01-31 15:16:45 -08:00
Derek Jedral
8c368cf22f [automerger skipped] Add strings for active unlock in settings am: 7e524288b5 am: f97be25252 -s ours
am skip reason: Merged-In I41e3b9c1830212303fc3379462e80cb18a23d026 with SHA-1 2221964344 is already in history

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

Change-Id: I7111f788ce8146de13de0a9bc3fa5ef88211ef65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31 22:05:50 +00:00
Derek Jedral
f97be25252 Add strings for active unlock in settings am: 7e524288b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21085463

Change-Id: Iaa95d0da2da997d685cedffe6b9c0396c92f6e2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31 20:55:11 +00:00
Derek Jedral
957a35bd26 Merge "Route to active unlock component" 2023-01-31 19:43:05 +00:00
Neil Fuller
59c8e2f89c Merge "Add "Use location" state to TimeZoneCapabilities" 2023-01-31 15:57:43 +00:00
TreeHugger Robot
e0f2d9c879 Merge "[Battery Usage U] Add logging for selecting by the dropdown in battery usage page" 2023-01-31 13:30:00 +00:00
Yilin Cai
ed4f08e8af Merge "Use negative order in the special access items." 2023-01-31 12:29:52 +00:00
Zaiyue Xue
495d6d5030 [Battery Usage U] Add logging for selecting by the dropdown in battery usage page
Bug: 267270271
Fix: 267270271
Test: presubmit
Change-Id: I5c74afb48188b8bab2d4d1d087bc62db3baa4963
2023-01-31 20:02:35 +08:00
Bonian Chen
ef241b863f Merge "[Settings] Avoid from accessing LifecycleOwner when not available" 2023-01-31 11:46:42 +00:00
TreeHugger Robot
1b73b6c63b Merge "Fix battery usage chart error when daylight saving." 2023-01-31 11:44:39 +00:00
TreeHugger Robot
2646bc2f07 Merge "Fix b/266795925: Different font size in IW language." 2023-01-31 11:41:16 +00:00
Max Spencer
ab8c9d79f4 No screen lock notification
Settings already sends a SafetySourceIssue to Safety Center when the
user has not set a screen lock. This CL specifies the corresponding
notification for Safety Center to post for that issue.

Also specified the actionability of this issue as manual (although
this is the default so no functional change here, just for clarity).

Fix: 265799125
Bug: 260574754
Test: Manually
Change-Id: I9d579cdb8061d247e89031a5bc360f8fd5848277
2023-01-31 10:48:58 +00:00
Zaiyue Xue
4af2ef80b0 Fix b/266795925: Different font size in IW language.
Bug: 266795925
Fix: 266795925
Test: manual
Change-Id: I9bd726852484cb33e2b442e5da19d2ac99e596ed
2023-01-31 18:40:01 +08:00
Zaiyue Xue
d72ff28a52 Fix battery usage chart error when daylight saving.
Bug: 258000978
Fix: 258000978
Test: presubmit
Change-Id: Ia8746ec67f0f37dd35043f78f2aa55d2ef7c215b
2023-01-31 18:33:47 +08:00
Chaohui Wang
750c6072b9 Use SettingsAlertDialog for app button dialogs
Use the spa standard widget SettingsAlertDialog to unify the dialog
style.

Bug: 236346018
Test: Manually with Settings
Test: Unit test
Change-Id: Idb231600e38ec7b0244baa5101da912ed2b9fd3c
2023-01-31 17:42:39 +08:00
Bonian Chen
5f9b1084c3 [Settings] Avoid from accessing LifecycleOwner when not available
Only access LifecycleOwner when available.

Bug: 266872811
Test: local

Change-Id: Id575a71e20e79f8efadb49af128c1a43c058acdd
2023-01-31 08:41:52 +00:00
Yuanjia Hsu
10ed79ba5c Merge "Implement “Set up Face or Fingerprint Unlock first” page" 2023-01-31 07:49:22 +00:00
Daniel Huang
7acbaf2d13 Merge "Implement trackpad gestures education UI." 2023-01-31 06:55:34 +00:00
TreeHugger Robot
db6c645f7e Merge "Update fingerprint introduction string" 2023-01-31 06:53:05 +00:00
TreeHugger Robot
5ec2bbf6fb Merge "Update string for auto data switch" 2023-01-31 05:41:14 +00:00
Josh Hou
060ade395a Merge "Fix the security vulnerability issue in AppLocalePickerActivity" 2023-01-31 05:31:39 +00:00
Milton Wu
1cef4545c8 Update fingerprint introduction string
Update introduction string to show device name

Bug: 251727719
Test: Manually check FingerprintEnrollIntroduction and
      FingerprintSettings page
Change-Id: Ie44a5e3e41e0ff2acaaa2388b04068b218da1c67
2023-01-31 05:28:42 +00:00
Yilin Cai
250131665c Use negative order in the special access items.
This is to ensure unspecified injected items show up at the bottom of the list.

Test: local build
Bug: 242280896
Change-Id: I2c4a0a15029be924f85e4145faed17a2a8cd3594
2023-01-31 12:31:55 +08:00
Ling Ma
a3481dbb73 Update string for auto data switch
Tech Content writer doc approved: https://docs.google.com/document/d/1xvBbqnT-wxIr8cYeK6YfYjDeThGdkvlcKVfHiPZYzok/edit?resourcekey=0-4QXl7yJ9HBywNTweahwXhQ#heading=h.ny4etf5emka8

Test: verified by flashing the UI
Change-Id: I6f6370a43433c2933f48577ba1580b063e728f08
2023-01-30 20:24:35 -08:00
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