PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,232 Commits 1 Branch 0 Tags
f54aaa11062da27dd3c79a484feddc488eb5074f
Commit Graph

123232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jack He
ceb3ec60ee Merge "Remove CSIP/VCP enable/disable from Setting" into udc-dev am: d55e645795 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23065696

Change-Id: Ia9c2d8f8d19567ab3e28bddb87bbff0fe0351c7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 09:56:46 +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
Vincent Wang
5801e98d7f Merge "Test Fix SettingRobolectricTest Fail" into udc-dev 2023-05-09 09:50:50 +00:00
Chaohui Wang
1cc7d75d91 Merge changes I07d964b9,Ifa5928e1 into udc-dev 
* changes:
  Fix flicker in SIM card page
  Clean up DefaultSubscriptionController.getSummary
 2023-05-09 09:02:19 +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
Jason Chang
12d36b5e36 Merge "Fix 'Do it later' button overlaps with text depending on landscape direction" into udc-d1-dev am: 5f7ffb31d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23050583

Change-Id: Icb12347896766ae956edf8220a05f0e7436b3f3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 08:32:00 +00:00
Shawn Lin
48cbe70a21 Merge "Set the talkback focus to the header text when Stage is NeedToConfirm" into udc-dev am: f5b4a2388d am: e601136991 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23053883

Change-Id: I056d2974f39152fbfcf93cd8cba7260ba7e58483
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 08:16:34 +00:00
Treehugger Robot
d8245c410e Merge "Disable provider if removed from primary" into udc-dev am: ee54d713d5 am: 7251199304 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23092304

Change-Id: I6239d3681b92ff611842cfc6322c8f569688623b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 07:56:30 +00:00
Jack He
191fe2ab6f Merge "Remove CSIP/VCP enable/disable from Setting" into udc-dev am: d55e645795 am: 7d96f185ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23065696

Change-Id: Ie8db1e59e1fe9a5363c4bbd7940e9795a755ce9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 07:35:57 +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
Shawn Lin
e601136991 Merge "Set the talkback focus to the header text when Stage is NeedToConfirm" into udc-dev am: f5b4a2388d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23053883

Change-Id: Ie692511a4b8bbd56b23c93dde8019f3f9072e425
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 07:13:08 +00:00
Jason Chang
5f7ffb31d2 Merge "Fix 'Do it later' button overlaps with text depending on landscape direction" into udc-d1-dev 2023-05-09 07:03:38 +00:00
Vincent Wang
818f77cd1f Test Fix SettingRobolectricTest Fail 
Bug: b/275023433
Test: NA
Change-Id: If2dcb8f6c196327129ccc9375b190e394c994efa
 2023-05-09 06:26:39 +00:00
Jack He
7d96f185ee Merge "Remove CSIP/VCP enable/disable from Setting" into udc-dev am: d55e645795 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23065696

Change-Id: Ib7e054b0f9bb497d227d32d9a8fbbd4acb7003a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 06:20:49 +00:00
Shawn Lin
5a62b289e9 Merge "Set the talkback focus to the header text when Stage is NeedToConfirm" into udc-dev am: f5b4a2388d am: 01a434865f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23053883

Change-Id: Ibe57a45ee6586e718b1834350fb7898c0fa4b1ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 06:16:00 +00:00
TreeHugger Robot
910530482a Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev 2023-05-09 06:01:11 +00:00
Chaohui Wang
d758fe853b Merge "Fix ANR of SimSlotChangeService" into udc-dev 2023-05-09 05:38:11 +00:00
Treehugger Robot
83cc6a64c6 Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev 2023-05-09 05:33:40 +00:00
Treehugger Robot
7251199304 Merge "Disable provider if removed from primary" into udc-dev am: ee54d713d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23092304

Change-Id: I8818f8d1c0df1a2e00b29aef7463643e2b5f7fea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 05:33:40 +00:00
Shawn Lin
01a434865f Merge "Set the talkback focus to the header text when Stage is NeedToConfirm" into udc-dev am: f5b4a2388d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23053883

Change-Id: I2b05046353006f6053f9dcc268dbfdbed66c4b39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 05:15:47 +00:00
Becca Hughes
d04cc5eec6 Merge "Disable all providers if none selected" into udc-dev am: 762691c365 am: 1d31a84b3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086870

Change-Id: Id382284a59d0839beab2bfb382aab9cd3253f682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 04:51:41 +00:00
Treehugger Robot
a46d251e01 Merge "Disable provider if removed from primary" into udc-dev am: ee54d713d5 am: 25115c82a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23092304

Change-Id: I39a9f78342ca0796eabc20c26275229cba170e28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 04:43:35 +00:00
Weng Su
e24cbeb6b7 Merge "Refine Settings textColor" into udc-dev 2023-05-09 04:27:35 +00:00
Guangjie (Jerry) Shi
ece191b09f Merge "Fix work profile issue" into udc-dev 2023-05-09 03:47:05 +00:00
Treehugger Robot
25115c82a4 Merge "Disable provider if removed from primary" into udc-dev am: ee54d713d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23092304

Change-Id: I8857f30dbf252f4c1843310ab21156c8d936d8f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 03:46:20 +00:00
Becca Hughes
1d31a84b3d Merge "Disable all providers if none selected" into udc-dev am: 762691c365 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086870

Change-Id: Iba03950d49b589d6224b755a1eea1a9fd708804e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 03:09:08 +00:00
Jack He
6edb515a9f Revert "Remove CSIP/VCP enable/disable from Setting" 
This reverts commit 345889b5e2.

Reason for revert: Accidental merge, should merge together with prebuilt

Bug: 280626194
Change-Id: I93f66f22b55eb906f8e079de35f2db00b102c788
 2023-05-09 02:44:45 +00:00
Jack He
d55e645795 Merge "Remove CSIP/VCP enable/disable from Setting" into udc-dev 2023-05-09 02:43:13 +00:00
Shawn Lin
f5b4a2388d Merge "Set the talkback focus to the header text when Stage is NeedToConfirm" into udc-dev 2023-05-09 02:11:48 +00:00
Austin Delgado
d8a0b91e1a Merge "Fix going back after biometric enrollment in SUW" into udc-dev am: 2971c13923 am: 7246a93bd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23060222

Change-Id: I7ed684004b383d2d468a34831c9384398fb1aae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 02:04:57 +00:00
Treehugger Robot
ee54d713d5 Merge "Disable provider if removed from primary" into udc-dev 2023-05-09 02:01:46 +00:00
Derek Jedral
98d9c60736 Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0 am: 2696c8dbc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141

Change-Id: I6f10b9fcd44d562d3bdf47f66b7b4cadcdd6b926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 01:54:08 +00:00
Austin Delgado
7246a93bd3 Merge "Fix going back after biometric enrollment in SUW" into udc-dev am: 2971c13923 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23060222

Change-Id: I99b155b7965f04739bcbddf15fe75a3633cc07bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 01:48:10 +00:00
Sunny Shao
aeb42d1438 Fix the UI in the left side & right side inconsistent problem 
- Let the homepage show "Network & Internet" item in demo mode on large screen device.

Fixes: 276157240
Test: atest TopLevelNetworkEntryPreferenceControllerTest
Change-Id: Ife8bce28e6bc47caf3f06b1027579ea0e52172a3
 2023-05-09 09:39:36 +08:00
Becca Hughes
72ff60a0e4 Merge "Disable all providers if none selected" into udc-dev am: 762691c365 am: 9230389dcd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086870

Change-Id: I32c068036822267003322299e4ff7f22e32b4dc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 01:14:44 +00:00
Austin Delgado
8c8cf133be Merge "Fix going back after biometric enrollment in SUW" into udc-dev am: 2971c13923 am: 083f9699c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23060222

Change-Id: I3eb79af0410b2ca6b7e41ff2dfccd403e64fcd0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 01:06:20 +00:00
Becca Hughes
9230389dcd Merge "Disable all providers if none selected" into udc-dev am: 762691c365 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086870

Change-Id: I3bba36664b2accc006218d46160383f73504da9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 00:49:58 +00:00
Austin Delgado
083f9699c5 Merge "Fix going back after biometric enrollment in SUW" into udc-dev am: 2971c13923 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23060222

Change-Id: I39cd3cb9c37b0440027c9396f557207fafd6f35e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 00:19:45 +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
9e5b34ceb0 Disable provider if removed from primary 
Test: make
Bug: 281109887
Change-Id: Ie301cfc57176c6563b4be5cc661514a4324477c9
 2023-05-08 23:42:47 +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
Becca Hughes
762691c365 Merge "Disable all providers if none selected" into udc-dev 2023-05-08 20:58:01 +00:00
Derek Jedral
501f3635dc Remove feature flag for active unlock 
Active Unlock was guarded behind a feature flag for two main purposes.
1) To select the unlock intent or biometric failure layout. We've
   settled on unlock intent, so we no longer need the biometric failure
   codepath.
2) To guard the feature rollout. However, the additional platform guard
   is not necessary, since this feature availability is still guarded
   based on whether the secure settings are flipped to valid targets.
In order to keep the scope of this CL small, useBiometricFailureLayout
always returns false. Another CL will clean up all areas where it and
useUnlockIntentLayout are referenced.

Test: make RunSettingsRoboTests
Bug: b/280306741
Change-Id: I331afe9654b72249d461007c087e7f81783d7625
 2023-05-08 12:46:36 -07:00
Austin Delgado
2971c13923 Merge "Fix going back after biometric enrollment in SUW" into udc-dev 2023-05-08 19:39:41 +00:00
Nan Wu
a23f9a69e0 Allow BAL for confirm device credential activity when work profile 
apps are protected by PIN prompt.

Test: manual test
Bug: 279889563
Change-Id: Ife319469cee908f54618986107b40bcc82886b06
 2023-05-08 18:00:14 +00:00
Derek Jedral
42deb763e0 Merge "Change preference title if Active Unlock enabled" into udc-dev 2023-05-08 17:56:32 +00:00
Austin Delgado
6e745242da Fix going back after biometric enrollment in SUW 
Bug: 280530120
Test: atest BiometricEnrollActivityTest
Test: tested manually by swiping back after enrollments
Change-Id: I305dd0904f86e2fc77f02047de8f3fc2c54621cb
 2023-05-08 17:24:19 +00:00