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
57c7dd9741
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: Iacff802347ca8f679ffc4e487cf62627c7d30f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 22:21:34 +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
Han Xu
8d8ce3f751
Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05
am: 3894103292
am: aa3607690f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178
Change-Id: If89e1522285e9fa6f81ad14b4bbd056ef448cfe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 18:44:44 +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
Han Xu
aa3607690f
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: Iba93634c1cea2f17bc89225c560beab89a4a6801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 17:46:03 +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
4c1a703192
Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05
am: 7a1efdb589
am: b2f83bcd3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178
Change-Id: I14f51a4d7a2cd8070d90cd31e02716d9c803d015
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 14:41:40 +00:00
Han Xu
1d0bcd5b36
Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05
am: 3894103292
am: 07509fdb48
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178
Change-Id: I9fa547ff36beb800cd9ac8ced142211e8a409e22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 14:40:50 +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
Treehugger Robot
31d2f2b70c
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
am: b5682235cc
am: ef264fb304
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: I667fccc9685486740b61c0f0545e20694d6affe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 12:24:32 +00:00
Treehugger Robot
e2f4b5d242
Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9
am: dc11c24806
am: e42c86703b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645
Change-Id: I0b4e8fa0a9abffeb8dd459386f037380eb0d3d30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 12:24:13 +00:00
Treehugger Robot
01624257fb
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
am: 93ab64ef47
am: 33ba391274
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: I2c3540a7c7828f23ebb8ce13a8c237cfd772ccea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 12:20:09 +00:00
Treehugger Robot
d0304faca7
Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9
am: 99c883fd3f
am: c19f24b092
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645
Change-Id: I49397ccb1702f6c802c220c2a526a6dbec497e9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 12:19:59 +00:00
Treehugger Robot
e2ac5c55dc
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
am: b5682235cc
am: 06e92b4bf8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: Ib93f52eec186b4f3aeb535cf708d6184576b8b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 12:19:51 +00:00
Treehugger Robot
674600b53f
Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9
am: dc11c24806
am: 2ea4f0747e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645
Change-Id: Ib012475ebf31463dd2249c95cf7e33d34a2360cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 12:19:37 +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
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
ef264fb304
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: I07d591bbec5d5d2fe68d019613c424d319750f7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 11:42:13 +00:00
Treehugger Robot
e42c86703b
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: I417be26a4538146e20432c71bf6858e1f6bc8026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 11:42:00 +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
8341fad6bf
Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5
am: b03509284e
am: 07ee2d859d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482
Change-Id: I70cc5f8eca57b243fde998bd1ce4e0d0b8075b0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 09:58:35 +00:00
Angela Wang
87c42f29b0
Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5
am: f676c35f02
am: afe6a6388b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482
Change-Id: Ic4b511e26cc6d3c5b401addec8bf6a408e882f2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 09:49:02 +00:00
Angela Wang
37301c7e72
Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5
am: b03509284e
am: 3716e194b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482
Change-Id: Ia51ee15c9ea0add3538c7a78a6995bba4e88ffbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 09:48:54 +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
07ee2d859d
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: Ibfdba3482f10fd329b039449a006e3bf4ef0bc1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 09:15:23 +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