Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,596 Commits 1 Branch 0 Tags
bb9689461fee3e9afee3da6fbdcdf25caefb4264
Commit Graph

29032 Commits

Author SHA1 Message Date
Bill Yi
7b0fe10dd5 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-05-10 23:28:46 +00:00
Bill Yi
deaa34f3f7 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-05-10 23:28:46 +00:00
TreeHugger Robot
80190179ba Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078 am: 1e7990341c am: ed35b5e376 am: 672ef42ab8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496

Change-Id: I4934e755229741218d3b8979fc8318a2b412f168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 21:28:05 +00:00
Jigar Thakkar
b6e12d7ff1 Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120 am: 854a93c2d3 am: 28449684ca am: 33f1f4c479 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582

Change-Id: I196a12897085e7dd54caf5dcc3110c9b4a8a922e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 20:46:31 +00:00
Marcello Galhardo
6255d37ad9 Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300 am: d608996d1f am: d478fe535e am: af658f1ab4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850

Change-Id: Iab8c01d073f10dbbb55ebead9b8a883f5a93065a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 18:57:21 +00:00
Bill Lin
4caa3ece94 [conflict] Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc am: f6d23468b1 am: e5dfcc0270 am: 547f6d63a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802

Change-Id: I61fed7e932c8dc476b689ca61bbf8ee919924bed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 16:29:52 +00:00
TreeHugger Robot
ed35b5e376 Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078 am: 1e7990341c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496

Change-Id: I30b75d09f1827198e788b2afac096df87bf79306
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 16:02:06 +00:00
TreeHugger Robot
1e7990341c Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496

Change-Id: I3e9f8ee058f36819fad9675afd69f07d6524cbe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 15:24:16 +00:00
TreeHugger Robot
c0c0edd078 Merge "Fix title of no-screen-lock notification" into udc-dev 2023-05-10 14:33:36 +00:00
Jigar Thakkar
28449684ca Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120 am: 854a93c2d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582

Change-Id: I5260cc0cf08d72f1d37b9689355b6a894a01dd8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 14:01:30 +00:00
Jigar Thakkar
854a93c2d3 Merge "Modify clone profile accounts info section" into udc-dev am: 002f06e120 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761582

Change-Id: I1b5382aa0f132545d23082e3273e4756aa5d54ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 13:40:58 +00:00
Jigar Thakkar
002f06e120 Merge "Modify clone profile accounts info section" into udc-dev 2023-05-10 13:38:58 +00:00
Marcello Galhardo
af658f1ab4 Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300 am: d608996d1f am: d478fe535e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850

Change-Id: I400e5f91996be0e02d488d0fee5e2b59e3b1b7ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 09:48:00 +00:00
Marcello Galhardo
af59a41da5 Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300 am: 8f2ebb1510 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850

Change-Id: I0ecf5c9c5af83b4d9e4d8ebf50d0866e4665cfe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 09:45:07 +00:00
Marcello Galhardo
d608996d1f Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850

Change-Id: I1bccba1b2642e39155543448f4d2feba3139f736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 09:44:40 +00:00
Marcello Galhardo
8f2ebb1510 Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev am: f5a3485300 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048850

Change-Id: I9bf03c4fec44e7fe97f3d1023115d823607d20c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-10 09:40:30 +00:00
Marcello Galhardo
f5a3485300 Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev 2023-05-10 09:23:52 +00:00
Bill Yi
759fc346cc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0011aa8a1c919344865626e4e263080904cd8341
 2023-05-09 19:55:12 -07:00
Bill Yi
efe251ca9d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3c5403f2740d536e60f87ae605ebe1d6cd13dacf
 2023-05-09 19:52:57 -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
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
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