Bill Yi
b6efea437a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9247eac3406d8d55e580a2012484fb58dc72aa4e
2023-05-09 19:49:52 -07:00
Bill Yi
227df01c9b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibd86c070b71afe024df51354f05d5dc5313e5efd
2023-05-09 19:13:07 -07:00
Bill Yi
e69bec0564
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If7cdbc4d2562b4104a9de90f1f97b67eadcc4ad1
2023-05-09 19:10:50 -07:00
Bill Yi
f6e1ce0079
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If67335f6cb1c4d116442209acd6161b966e5560c
2023-05-09 19:07:40 -07:00
Bill Yi
be6f57545f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I33712e7c3fd9062f28b3043d2dd6189a52532254
2023-05-09 19:06:37 -07:00
Bill Lin
e5dfcc0270
Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc
am: f6d23468b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802
Change-Id: I409d9db2155b71005aeec519dadac701f5e5d550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 01:09:37 +00:00
Hao Dong
bb03fc355e
Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen."
2023-05-10 00:48:15 +00:00
Bill Lin
9eb1ba4169
Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802
Change-Id: Ia55e7d1a1abadd54644e8ec60c61930cf7255abc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 00:29:49 +00:00
Bill Lin
496ad744db
Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802
Change-Id: I5c1e7bca3eda4ce7bbf056107dd7e7631fd82fd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 00:28:40 +00:00
Bill Lin
f6d23468b1
Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802
Change-Id: I4606997e91b4e23c76480362c6736efb464d7652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 00:28:30 +00:00
Hao Dong
968c5fb6f0
Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen.
...
Bug: 279823572
Test: atest FingerprintSettingsFragmentTest
Test: atest ChooseLockGenericTest
Change-Id: Ie4bc18bf245eb7a755862401c710d85381063ff9
2023-05-09 21:32:44 +00:00
Peter Zhang
3e498ad30d
Render an additional icon to the tappable tiles with pending intents
...
Test: robotest, manual
Bug: 281517110
Change-Id: Ia5fbae63d56a6f1e6ee8fb3ee58ae912d14b6c75
2023-05-09 19:49:57 +02:00
Angela Wang
53a8cc0326
Disabled state UI of Flash Notifications preview button
...
When both the camera flash and screen flash toggles are turned off, tapping on the preview button will have no effect and may confuse users. To avoid this, the appearance of the preview button should be updated to clearly indicated that its current state is disabled. This wil help users better understand the situation and prevent confusion.
Bug: 276494146
Test: checks the UI manually
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FlashNotificationsPreviewPreferenceTest
Change-Id: I55b11188fde6e551921a9b0f7c89daa20a8b766b
2023-05-09 16:48:35 +00:00
Weng Su
8ea7e0d650
Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7
am: 0a4538dd97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621
Change-Id: Ic7bbfc071f0ef22a0c93a972f9b2d51cc45fc41b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:10:31 +00:00
Guangjie (Jerry) Shi
725d3ae647
Merge "Fix work profile issue" into udc-dev am: ece191b09f
am: 1855ff060c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086871
Change-Id: I324c9c494d23e34423204589993f67a71e97cc95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:10:10 +00:00
Weng Su
b6a52e9c74
Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7
am: aed54a1296
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621
Change-Id: I14e04149f68092c36944d38120666bef355b1f52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:51:18 +00:00
Weng Su
bfc8efc4de
Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621
Change-Id: Ic6ebc234fb721cc0f2b0cf28bfdd029755aba943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:50:45 +00:00
Weng Su
aed54a1296
Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621
Change-Id: I0f24aec7218eb74cac52ca31a0e9ad3ccb30d44e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:42:13 +00:00
Weng Su
0a4538dd97
Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621
Change-Id: Ieb60ec8e97e23bb6d30419b5b287c73727aaaa1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:38:08 +00:00
Guangjie (Jerry) Shi
1855ff060c
Merge "Fix work profile issue" into udc-dev am: ece191b09f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086871
Change-Id: Ia264a90698f09a7d98e0180311b03acffeab92b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:32:12 +00:00
Guangjie (Jerry) Shi
deff8cb5a9
Merge "Fix work profile issue" into udc-dev am: ece191b09f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086871
Change-Id: I32d95d5daa4c5ad249e1e3daaae6ab42343e7893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:26:04 +00:00
lbill
67d6dff7cc
Refine SkipDialog title and desc by device configs
...
1. Wrap isFaceSupportedInSUW() in Settings Utils
2. Wrap getCombinedScreenLockOptions in Settings Utils
3. Add EXTRA_KEY_FOR_SUW to judge if in SUW flow
4. Refactor SetupSkipDialog by hasFace, hasFingerprint,
isSuw, isFaceSupported conditions
5. Clean up the mapping logic of SetupSkipDialog
6. Replace bools with @LockPatternUtils.CredentialType
7. Refine the logic for isFaceSupported
---------------------------------------
Config |SuwSupportFace|!SuwSupportFace|
isSuw | true | false |
!isSuw | hasFace | hasFace |
Bug: 263070591
Bug: 279389803
Bug: 279195215
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL
Test: SUW(workprofile), post-SUW
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.password
Test: m RunSettingsRoboTests ROBOTEST_FILTER=SetupSkipDialogTest
Change-Id: Ie7af4299695dc3983b4190929b4dd659c301c082
2023-05-09 09:55:52 +00:00
Guangjie (Jerry) Shi
bb63e41746
Merge "Fix work profile issue" into udc-dev am: ece191b09f
am: bcd1326690
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086871
Change-Id: I4cfeb45b10060bbd54bc61c46c7349f19ac6098f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 08:33:33 +00:00
Guangjie (Jerry) Shi
bcd1326690
Merge "Fix work profile issue" into udc-dev am: ece191b09f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086871
Change-Id: I174d4a00736084a32821c5328540b4e2d2663d7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 07:26:46 +00:00
Weng Su
e24cbeb6b7
Merge "Refine Settings textColor" into udc-dev
2023-05-09 04:27:35 +00:00
Derek Jedral
2696c8dbc7
Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141
Change-Id: Ib0a4b4b2b76a3d1bc2244dbb6a7080c8c4b23b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 00:18:36 +00:00
Becca Hughes
ad13689915
Fix work profile issue
...
Test: manual
Bug: 281332256
Change-Id: I5f47aacc84e5abe739ecc3bbad474957334e7c91
2023-05-08 23:27:59 +00:00
Derek Jedral
a783d32ab1
Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0
am: 898e1d95f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141
Change-Id: I2269002faf18bbd9932cc91908a74517c7f6b9ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 22:23:49 +00:00
Derek Jedral
898e1d95f3
Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141
Change-Id: I73bb1c3acb600908a9dca9eff4fa7b01486b78c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 21:46:18 +00:00
Derek Jedral
b3524b4223
Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0
am: 60419e72bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141
Change-Id: I8201e20c39ef02beebb117731b7ed9dcc105bae9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 20:27:38 +00:00
Derek Jedral
60419e72bd
Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141
Change-Id: I7b357d984dda1df053d2530f171c2523556d60d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 19:03:29 +00:00
Derek Jedral
42deb763e0
Merge "Change preference title if Active Unlock enabled" into udc-dev
2023-05-08 17:56:32 +00:00
Han Xu
db7883f0ed
Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05
am: ba00173dd8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178
Change-Id: I96349b64c76c1245ca91460046700c377ba6ce6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 14:49:58 +00:00
Han Xu
07509fdb48
Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05
am: 3894103292
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178
Change-Id: I214ed455a66ce6ae4319d84be959a57bdbef6f59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 14:05:24 +00:00
Weng Su
2b4d808898
Refine Settings textColor
...
- Update textColor from textColorTertiary to textColorSecondary
Bug: 271501723
Test: Manual testing with the Accessibility Scanner tool
Change-Id: I57c31ba5c6e066e21fea234502b24aaed15998d7
2023-05-08 21:58:45 +08:00
Han Xu
ba00173dd8
Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178
Change-Id: I4c4af3d411c2cd86958aafea98597aca5d111fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 13:46:53 +00:00
Han Xu
3894103292
Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178
Change-Id: Icfa29d0fa13e61acee1a0173d3d6e6603c04c97c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 13:26:28 +00:00
Han Xu
7a1efdb589
Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178
Change-Id: I3a93f7089e99b1c85191c29963cf35bcb4e65796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 13:01:03 +00:00
Han Xu
2f970a1a05
Merge "Fix wifi QR layout to fix image stretching" into udc-dev
2023-05-08 12:17:59 +00:00
Treehugger Robot
06e92b4bf8
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
am: b5682235cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: Idf5508432319cec7cc2f5239260e3365d6e55ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 11:38:52 +00:00
Treehugger Robot
6da502033a
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
am: 2b6cf42130
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: I6d2fb3b56242c3f2e089093cbe3081e2ef0ac30a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 11:38:37 +00:00
Treehugger Robot
b5682235cc
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: I18598bec86a2ad09837544559b7044eda190a247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 11:00:53 +00:00
Treehugger Robot
2b6cf42130
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: I5f349188e8965a7063c2ae5dfdbec6900e2e9855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 11:00:45 +00:00
Treehugger Robot
93ab64ef47
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: I231ff30e5df9248bf3713511ebb00795c502cba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 10:56:22 +00:00
Treehugger Robot
23d3eda967
Merge "Fix the battery string incorrect spelling" into udc-dev
2023-05-08 10:36:09 +00:00
Angela Wang
d72f221a9b
Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5
am: 75b08ce5ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482
Change-Id: I1c8e3f1fbc69031a6837ea565be008088d4493b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 09:11:21 +00:00
Angela Wang
3716e194b1
Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5
am: b03509284e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482
Change-Id: Ibbb77dba4c77c09f2f6deb2db4bafefa82ed151f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 09:11:21 +00:00
Angela Wang
b03509284e
Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482
Change-Id: I3e48ca3c397b530d8158d2e012d6a4867976b2d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 08:33:26 +00:00
Angela Wang
75b08ce5ab
Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482
Change-Id: I2b92a152a995f46684c2ebfc4a83694691f60743
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 08:33:26 +00:00
Angela Wang
f676c35f02
Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482
Change-Id: I80b2e6a7bbe73212482521e5810430b9dcd0252f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 08:29:26 +00:00