Commit Graph

123506 Commits

Author SHA1 Message Date
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
Becca Hughes
5262570691 Disable all providers if none selected
Bug: 280905737
Test: manual
Change-Id: I53214c29cd7f03c8034284e5067f03305566397a
2023-05-08 17:19:52 +00:00
Han Xu
b2f83bcd3a Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05 am: 7a1efdb589
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178

Change-Id: I86b3283678d4abd0dd5ff08c438650eb69840886
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 14:30:56 +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
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
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
Treehugger Robot
33ba391274 Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 am: 93ab64ef47
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181

Change-Id: Ib5467588c0b5c6cc68f97d95bdeb58f84e115b7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 11:43:20 +00:00
Treehugger Robot
c19f24b092 Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9 am: 99c883fd3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645

Change-Id: I8f129892f4f10838a059730436d4ae957846b476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 11:43:12 +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
2ea4f0747e Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9 am: dc11c24806
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645

Change-Id: Ieeb3a1b72e00c95592374b5e595e5b2d01906ef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 11:38:45 +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
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
dc11c24806 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: I583abc51b4e4160783d8ca14d810418b675892d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 10:59:44 +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
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
99c883fd3f 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: I7544b0326987e4397d7baab8514b1d1388d52005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 10:55:48 +00: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
afe6a6388b Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: f676c35f02
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482

Change-Id: Iad821e17698321a88b6464fc0693b340d7141748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 09:15:58 +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
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
Jason Chang
c4c2d65282 Fix 'Do it later' button overlaps with text depending on
landscape direction

Set Gliflayout content padding top to 0 to make it more space.

Bug: 279792554

Test: manually test with reproduciable steps:
1. Start setup until Fingerprint Unlock
2. Scroll down
3. Accept the introduction
4. Do as instructed
5. Flip the phone 180 degrees

Change-Id: I1875691cccfc75062c6d8c9517240569ae0a4261
2023-05-08 08:23:00 +00:00
ykhung
f31c8a477f Fix the battery string incorrect spelling
Fix: 281473201
Test: presubmit
Change-Id: I9e4eb7f6c18918620a5e12680a30a5ba8bc7aa42
2023-05-08 16:10:27 +08:00