Commit Graph

119645 Commits

Author SHA1 Message Date
Josh Hou
d5c65e7ef1 [automerger skipped] Fix the security vulnerability issue in AppLocalePickerActivity am: 33ef83795e am: 30c88f6ff3 -s ours
am skip reason: Merged-In I2e25a308bcba6ea0edee89c7a78465f766bdbeac with SHA-1 ed9cbdea18 is already in history

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

Change-Id: I5d7d6fd19f153baf3b4a62ccc04906fc20b35d96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 01:28:41 +00:00
Josh Hou
30c88f6ff3 Fix the security vulnerability issue in AppLocalePickerActivity am: 33ef83795e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21152842

Change-Id: I53a4279eb0dc9044a97fd15e193e95fd0c16ec9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 00:49:52 +00:00
Diya Bera
55dd3a4f6d Merge "Tests for SUW in work mode" into tm-qpr-dev am: 31406c042d am: 4d67530e85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20505465

Change-Id: Ib6259a7897a43bc326410c17c4baa5f681edc7b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 00:33:16 +00:00
Diya Bera
4d67530e85 Merge "Tests for SUW in work mode" into tm-qpr-dev am: 31406c042d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20505465

Change-Id: Ida39801c898a529725f3fc7484e8907a2591e348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 23:59:37 +00:00
Diya Bera
31406c042d Merge "Tests for SUW in work mode" into tm-qpr-dev 2023-02-01 23:29:35 +00:00
Edgar Wang
0fd7e6e3e7 Merge "Update lottie illustration for tablet" into tm-qpr-dev am: b5215abde7 am: 366ed57197
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154459

Change-Id: I7ba454aa3a58ec6c8f848ac5d09ea2385fdb3a33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 23:06:50 +00:00
Diya Bera
1021b58ae5 Tests for SUW in work mode
Bug: 247049655
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=MultiBiometricEnrollHelperTest
Change-Id: Ifabb96a90c340bc9306cc0f033ba103c614f32a9
2023-02-01 22:05:09 +00:00
TreeHugger Robot
afb30cdd08 Merge "Make pre-upgrade footer appear more consistently" 2023-02-01 18:30:13 +00:00
Jason Chang
4e03bc2133 Merge "Fix string was shown with "Phone" in the tablet device" 2023-02-01 10:53:45 +00:00
Edgar Wang
366ed57197 Merge "Update lottie illustration for tablet" into tm-qpr-dev am: b5215abde7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154459

Change-Id: If11468af414a092695276e4040f735fc88245828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 10:45:19 +00:00
Edgar Wang
b5215abde7 Merge "Update lottie illustration for tablet" into tm-qpr-dev 2023-02-01 10:22:46 +00:00
Josh Hou
33ef83795e Fix the security vulnerability issue in AppLocalePickerActivity
Examine whether the packages is allowed to display app locales list when creating the AppLocalePickerActivity, and examine whether the target user is the same as the calling user.

Bug: 257954050
Test: Follows the test step listed in b/257954050#comment14
Change-Id: I2e25a308bcba6ea0edee89c7a78465f766bdbeac
Merged-In: I2e25a308bcba6ea0edee89c7a78465f766bdbeac
2023-02-01 15:49:20 +08:00
Edgar Wang
2f5f6d4ee6 Update lottie illustration for tablet
Bug: 243889662
Bug: 243889643
Test: visual
Change-Id: Icac10e4401da3d704350aef6ef2723ff92ca34f8
2023-02-01 07:27:18 +00:00
Jason Chang
c144de0b9d Fix string was shown with "Phone" in the tablet device
Add string "product" attribute for "tablet" and "device" strings.

Bug: 233295460

Test: build ROM then using issue reproducible steps to verify
screen lock strings

Change-Id: I912364fd54e7100c8a7e59c5b49e26467cec8142
2023-02-01 06:58:00 +00:00
George
2c5d1f8d29 Adding Nfc Tag App Preference setting to special_access settings
In the settings app, allow users to change the preference of the Nfc Tag apps.

Bug: 244272155
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NfcTagAppsPreferenceControllerTest
Change-Id: I28903fae8935613a0e8618da21ca44e98b8801d5
2023-02-01 14:10:04 +08:00
Chaohui Wang
a72e62b3a3 Merge "Use SettingsAlertDialog for app button dialogs" 2023-02-01 02:43:24 +00:00
Yong Zhang
a5cdbee7b9 Merge "Adjust AlwaysExpand List so that face detail settings will show in side panel while posture guidance will show full-screen" into tm-qpr-dev am: 6cb1a7ce5a am: f691b4302d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21135024

Change-Id: I45505e8c798e51b36b828f31d0b31046c0c8c0ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 00:52:55 +00:00
Derek Jedral
1e43f8f22d Merge "Fix NPE with registering content listener" 2023-02-01 00:24:00 +00:00
Yong Zhang
f691b4302d Merge "Adjust AlwaysExpand List so that face detail settings will show in side panel while posture guidance will show full-screen" into tm-qpr-dev am: 6cb1a7ce5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21135024

Change-Id: I64554550e193357bc8e7061888e771f1e1d27b44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 00:11:05 +00:00
Yong Zhang
6cb1a7ce5a Merge "Adjust AlwaysExpand List so that face detail settings will show in side panel while posture guidance will show full-screen" into tm-qpr-dev 2023-01-31 23:33:24 +00:00
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
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