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
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
Daniel Norman
590eefb55a
[automerger skipped] Merge "RESTRICT AUTOMERGE Updates Accessibilty Settings resources for sw600dp." into tm-qpr-dev am: f6e3be8352
am: 758951ae83
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21050692
Change-Id: I4592c8c18f8a8b04264fc81b019d3e7ed0793512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 19:32:29 +00:00
Daniel Norman
f1c6781e46
[automerger skipped] RESTRICT AUTOMERGE Updates Accessibilty Settings resources for sw600dp. am: 383c10fe93
am: d443d32182
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21050692
Change-Id: I80864f572fb1e8b1564605cf50b8024323ded4fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 19:32:22 +00:00
Daniel Norman
758951ae83
Merge "RESTRICT AUTOMERGE Updates Accessibilty Settings resources for sw600dp." into tm-qpr-dev am: f6e3be8352
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21050692
Change-Id: Iee19672e20d6b8522f77a231dafee0791f2a9703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 18:41:19 +00:00
Daniel Norman
d443d32182
RESTRICT AUTOMERGE Updates Accessibilty Settings resources for sw600dp. am: 383c10fe93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21050692
Change-Id: I7b1cf7c7f5f7c69d1a5b98e0210f8bb81027a08f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 18:41:11 +00:00
Daniel Norman
f6e3be8352
Merge "RESTRICT AUTOMERGE Updates Accessibilty Settings resources for sw600dp." into tm-qpr-dev
2023-01-25 17:44:40 +00:00
TreeHugger Robot
43eb9f8fc9
Merge "Add strings for active unlock in settings"
2023-01-25 09:29:40 +00:00
Derek Jedral
2221964344
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
Change-Id: I41e3b9c1830212303fc3379462e80cb18a23d026
2023-01-25 08:07:10 +00:00
Tyler Freeman
78d943e9d1
chore(magnification): update assets for tablets am: fe7f4fe5ad
am: bb8f8d9a59
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21053107
Change-Id: I27cbaefe4f5f204cc1037eb223c1f375ba374122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 04:36:32 +00:00
Tyler Freeman
bb8f8d9a59
chore(magnification): update assets for tablets am: fe7f4fe5ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21053107
Change-Id: I80e9657132e0dad2b8c6550bb2273f948d8cffd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 03:46:59 +00:00
TreeHugger Robot
fd4be32732
Merge "Fix b/265364490: [UX] [Battery usage] Remove comma between hour and min for screen time"
2023-01-25 03:45:12 +00:00
Treehugger Robot
d7ef82078c
Merge "Fix NullPointerException when renaming a fingerprint" am: 5f27701d95
am: 1d7192e9f6
am: 5ebb151415
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2402034
Change-Id: I3ee36a6414a03a41227c79815ef96b8b825c8a17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 03:27:18 +00:00
Treehugger Robot
5ebb151415
Merge "Fix NullPointerException when renaming a fingerprint" am: 5f27701d95
am: 1d7192e9f6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2402034
Change-Id: I8a73e24c88fcbecc35ea77ef79a253790a77f949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 02:58:33 +00:00
Treehugger Robot
1d7192e9f6
Merge "Fix NullPointerException when renaming a fingerprint" am: 5f27701d95
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2402034
Change-Id: I4f2e99ebcb887b0203fcb7bb915968b4acd11f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 02:15:02 +00:00
Treehugger Robot
5f27701d95
Merge "Fix NullPointerException when renaming a fingerprint"
2023-01-25 01:39:07 +00:00
Ilya Matyukhin
67d47f6b4a
Fix NullPointerException when renaming a fingerprint
...
(Original change made by xingbin.feng@sony.com )
Fix NullPointerException when rotating the screen while renaming
a registered fingerprint
Bug: 236873593
Test: Click a registered fingerprint to open the Rename dialog,
rotate the device and press OK. Verify that Settings does not
crash
Change-Id: I1350c4bd121e0a7aaa291b3b8f96c80ef777150b
2023-01-24 23:55:29 +00:00
Florian Mayer
a3484fe4a4
Merge "[MTE] Move toggle to dev options"
2023-01-24 23:44:57 +00:00
TreeHugger Robot
2478e8ee83
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: d3054dcb94
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21065934
Change-Id: I23323412b3453c128f0d83123119a5cbbeec57ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-24 19:28:55 +00:00
Tyler Freeman
fe7f4fe5ad
chore(magnification): update assets for tablets
...
Fix: 261547655
Fix: 243902461
Test: launch cf_x86_64_tablet, open Settings > Accessibility
Test: Open "Magnification", check banner animation
Test: Open "Magnification" > "Magnifcation Type", check images
Test: Perform the above with both light and dark mode.
Change-Id: I93fa93b32790de207edfd34fe95f416802a5dfee
2023-01-24 19:19:29 +00:00
TreeHugger Robot
84f0b132c0
Merge changes from topic "tc_change_23012315_21"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2b8993eea7
Import translations. DO NOT MERGE ANYWHERE
2023-01-24 18:38:09 +00:00
TreeHugger Robot
d3054dcb94
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-01-24 18:38:09 +00:00
TreeHugger Robot
4e561b0c79
Merge changes from topic "tc_change_23012315_21"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 61fe780a99
Import translations. DO NOT MERGE ANYWHERE
2023-01-24 18:38:09 +00:00
Zaiyue Xue
f622ebf269
Fix b/265364490: [UX] [Battery usage] Remove comma between hour and min for screen time
...
Bug: 265364490
Fix: 265364490
Test: manual
Change-Id: I380277674817bcc047d9d298cb889859048254b7
2023-01-24 23:12:47 +08:00
Bill Yi
2ab5f687a1
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-01-24 14:08:09 +00:00
Bill Yi
8876d02f96
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-01-24 14:08:09 +00:00
Bill Yi
f63d75a1a0
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-01-24 14:08:09 +00:00
Zoey Chen
7f8d96648c
Merge "[Settings] Do not insert subInfo repeatedly"
2023-01-24 13:16:12 +00:00
TreeHugger Robot
4f368ebe06
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b6eeb6c975
-s ours am: ce23f7b591
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21073566
Change-Id: Ic23e50ec919f41dc798cdc90ce87cc53fd0626ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-24 05:15:11 +00:00
Bill Yi
c7101c5498
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b50b32ff1
-s ours am: bdc9a968e3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21073566
Change-Id: I98b77fb88cb1c70ca852ca6595466e096ebd1eb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-24 05:15:08 +00:00
TreeHugger Robot
1937e416d7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: da8b6c7cbb
-s ours am: 67a186b189
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21073564
Change-Id: I4b1dd791d3f0cd41c6729528b21c7d787d41137a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-24 05:15:07 +00:00
Bill Yi
34cd13214e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe2b12b076
-s ours am: c31821fdb4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21073564
Change-Id: Ic9f3bdb91ed4d0f807fac669587f8815d98f60f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-24 05:15:04 +00:00
TreeHugger Robot
ce23f7b591
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b6eeb6c975
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21073566
Change-Id: I181dc4808288f0d7e64a85be2ac2002a50ba304f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-24 04:27:20 +00:00
Bill Yi
bdc9a968e3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b50b32ff1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21073566
Change-Id: Ibfaa4e02c383bc8910a9878adbf1691b285ab51f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-24 04:27:02 +00:00
TreeHugger Robot
67a186b189
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: da8b6c7cbb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21073564
Change-Id: I58e760bccfd34225ed46efa98f7852d67d84df18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-24 04:26:59 +00:00
Bill Yi
c31821fdb4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe2b12b076
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21073564
Change-Id: Iabb0164ba98dceb1958682711ade09701c549117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-24 04:25:48 +00:00
TreeHugger Robot
b6eeb6c975
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-01-24 03:48:22 +00:00
TreeHugger Robot
da8b6c7cbb
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-01-24 03:48:22 +00:00
Bill Yi
56f37af4ca
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2b8993eea7
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21065002
Change-Id: Id644e8cc60f50920203f35aa93f06c9e294c9207
2023-01-23 23:33:54 +00:00
Bill Yi
b3e9470165
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 61fe780a99
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21065934
Change-Id: Ia4a3e462b97f68328579b45132e4a77e96bc503d
2023-01-23 23:33:34 +00:00
TreeHugger Robot
b6b0209c9a
Merge "Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-qpr-dev am: 2b80fa789a
am: 8d0365e100
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21073703
Change-Id: Ic4e70342299f3b8e1e7b4417201695831ffeff71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-23 17:43:22 +00:00
Rubin Xu
d263d6c9ee
[automerger skipped] Merge "For top layout use FrameLayout than GlifLayout" into tm-qpr-dev am: 8f839acd71
am: ec8ad87f62
-s ours
...
am skip reason: Merged-In I9df8b1b7b5c19c61b92b30432bc7d78325876425 with SHA-1 3dcf68f321
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20979439
Change-Id: Ibfc9c4c48e4742ed249ffb137c2824e312bc005f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-23 17:42:17 +00:00
TreeHugger Robot
8d0365e100
Merge "Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-qpr-dev am: 2b80fa789a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21073703
Change-Id: I440fce8ab4e8bd3dbeac0fe410286bb196c39f7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-23 17:17:03 +00:00
TreeHugger Robot
2b80fa789a
Merge "Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-qpr-dev
2023-01-23 17:05:28 +00:00
Valentin Iftime
99b8b4cd60
Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails
...
When using EXTRA_USER_HANDLE, check for INTERACT_ACROSS_USERS_FULL permission on calling package.
Bug: 259385017
Test:
1. Build a test app that creates and starts an intent to NOTIFICATION_LISTENER_DETAIL_SETTINGS while setting the intent extra "android.intent.extra.user_handle" to UserHandle(secondaryUserId).
2. Create and switch to a secondary user
Settings > System > Multiple users > Allow multiple users > Add user > Switch to New user
3. Open Settings > Notifications > Device & app notifications and choose an app from the list (uses android.permission.BIND_NOTIFICATION_LISTENER_SERVICE). Enable Device & app notifications for selected app and disable all attributed permissions.
4. Switch back to the Owner user.
5. Get the userId of the secondary user: adb shell pm list users.
6. Open the test app and enter the userId for the secondary user and the component name that uses android.permission.BIND_NOTIFICATION_LISTENER_SERVICE.
8. In the settings window that open, enable all 4 sub-options.
9. Switch to the secondary user and note that the all sub-options for the app are disabled.
Change-Id: I875b9f2fc32c252acdcf8374a14067836e0f1ac6
2023-01-23 16:57:21 +00:00
Rubin Xu
ec8ad87f62
Merge "For top layout use FrameLayout than GlifLayout" into tm-qpr-dev am: 8f839acd71
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20979439
Change-Id: I61f851961501fb97fb63a804e157f370ad05726b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-23 16:57:15 +00:00