Automerger Merge Worker
7374006284
Merge "Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a" into udc-mainline-prod
2023-05-09 10:41:50 +00:00
TreeHugger Robot
914ed31fe3
Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572
Change-Id: I84c0e63a99e107078706f0c7a791729969f30325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:41:46 +00:00
TreeHugger Robot
035f91279a
Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572
Change-Id: Ic93863ba889db6073ceac7073902e2e690152012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:41:46 +00:00
Chaohui Wang
c688e7b316
Merge "Fix ANR of SimSlotChangeService" into udc-dev am: d758fe853b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083797
Change-Id: I68aa54b13a8253bbd330bd16c9c5dab32cc84723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:41:01 +00:00
Treehugger Robot
cb94f83fee
Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev am: 83cc6a64c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23101218
Change-Id: I481ebff42620108099ec56dbda24e5eed2c74bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:40:51 +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
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
Jack He
e556e425f1
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: Icd97d90d93dee167b1f65d48990e6f1a08f7b7b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 08:40:36 +00:00
Alice Kuo
560abbcc49
Revert "Revert "Remove CSIP/VCP enable/disable from Setting""
...
This reverts commit 6edb515a9f
.
Reason for revert: we need this change and need to merge together with prebuilt
Bug: 280626194
Change-Id: Id883c6c7c778154038c249f7be8e9fabf52299c3
2023-05-09 08:01:50 +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
Shawn Lin
4e48c03995
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: I55fc208013c2d09cc0d99da196cd9c34e06fcb4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 06:12:12 +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
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
156fa99227
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: Ie58ebbc13cdd4172a0f66b448a984dabe4a178a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 03:33:56 +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
Treehugger Robot
ee54d713d5
Merge "Disable provider if removed from primary" into udc-dev
2023-05-09 02:01:46 +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
e041dc64fb
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: I35c6a3e7651c2ce04f3eeb1c46ca566d4e4f5a64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 01:06:05 +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
Austin Delgado
b5eab0589a
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: Ic224ac2515ce4d50e61b52d259487c98d50b0a1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 22:20: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
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
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
Becca Hughes
5262570691
Disable all providers if none selected
...
Bug: 280905737
Test: manual
Change-Id: I53214c29cd7f03c8034284e5067f03305566397a
2023-05-08 17:19:52 +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
Chaohui Wang
394cec3c77
Fix ANR of SimSlotChangeService
...
The JobService.onStartJob() is run on main thread, should return in time
instead of wait for job complete, otherwise will cause ANR.
Not wait the job finish, and call jobFinished() when finished to fix
this issue.
Fix: 277031144
Test: Manual check with log that onStartJob() is returned in time
Test: Manual check with log that job is not run in main thread
Change-Id: I1e83363ca87a29fb9424100bf99b3f2d212fd9d0
2023-05-08 20:32:57 +08:00
Han Xu
2f970a1a05
Merge "Fix wifi QR layout to fix image stretching" into udc-dev
2023-05-08 12:17:59 +00:00
Chaohui Wang
2901125674
Fix flicker in SIM card page
...
Before fix, the DefaultSubscriptionController will set an empty summary
before data is ready.
Not set the summary before data is ready to fix.
Also fix the ignored tests.
Fix: 277301125
Test: Manual on Mobile Settings
Test: Unit test
Change-Id: I07d964b9f9ce21f8f168cb775eea188e48172c5d
2023-05-08 19:07:28 +08:00
Shawn Lin
4fef3fac2c
Set the talkback focus to the header text when Stage is NeedToConfirm
...
Should set the talkback focus to the header text when the "Draw your
pattern again" page is shown.
Bug: 275728120
Test: 1. enable talk back
2. Setup pattern lock
3. In "Draw your pattern again" page, make sure the talkback focus
is set to the header view
Change-Id: If99a950488039840e8486ebb634f0070a9403916
2023-05-08 19:01:33 +08: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
9e7da7aaba
Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645
Change-Id: Idb7bba03da26ed237bf0b5a726506effb5ff6e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 10:59:43 +00:00
Chaohui Wang
ab8a130674
Clean up DefaultSubscriptionController.getSummary
...
Which is always overridden by subclass after Change
I7d29b58ca5476ae0bb6fe2e04fecb96164cb1ada
This is a no op.
Bug: 277301125
Test: Manually with Mobile Settings
Test: Unit test
Change-Id: Ifa5928e1026b18c33f2bdd51fdcba267249dcee5
2023-05-08 18:56:06 +08:00
Treehugger Robot
23d3eda967
Merge "Fix the battery string incorrect spelling" into udc-dev
2023-05-08 10:36:09 +00:00
Treehugger Robot
fb1cebd7f9
Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev
2023-05-08 10:25:06 +00:00
Zoey Chen
48996e040b
[Metrics] Remove locale string from Metrics because it should be
...
reviewed
Bug: 279918056
Test: manual test
Change-Id: I1522bd8dba10eba7ba54958929376e1cb50504f6
2023-05-08 10:11:03 +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