PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
127,572 Commits 1 Branch 0 Tags
f71d183d0bdaae655ce0c0b81c2a3210715b984c
Commit Graph

127572 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
3daa00eee5 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-v2-dev am: 376bf07767 -s ours am: 30ea3d3cec -s ours am: 38280de428 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605760

Change-Id: I87427d5e6ec5ceb4a7d6f2e872d3838b36a31b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 11:19:35 +00:00
Taran Singh
6c693471db [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536abc8 -s ours am: 76f3f2efe8 -s ours am: e11d0e8502 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605760

Change-Id: I549bcd217f142a4519d14d52251380593a2f1055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 11:19:30 +00:00
Treehugger Robot
c60277f91e [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce -s ours am: 2c62993aca -s ours am: 71bf0d7467 -s ours am: 66539a3cda -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250

Change-Id: I2a322bb4e6fa9061e5e096b0ce6b13a1bc119c38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 11:19:01 +00:00
Taran Singh
c2fd42d3ec [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583 -s ours am: a8bd8948d1 -s ours am: 02ef9c46ec -s ours am: 7fa313e00e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250

Change-Id: I69e6f399519cd7a3f387677de73943daa9cd21e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 11:18:58 +00:00
Treehugger Robot
1dafc2d68b [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10 am: 000cdf1b5d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068

Change-Id: Id21fe1b2fcd064f0cf037e5059783e6039d4b58f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 11:18:24 +00:00
Taran Singh
047e435950 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: fdf0f64b90 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068

Change-Id: Iaafff271c0d5da951b91794fb558991dd3a99e4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 11:18:17 +00:00
Treehugger Robot
23eb92c4ba [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011

Change-Id: Ie770b0e9443ca2b41ec6d391cd272167bb52cabe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 10:40:13 +00:00
Taran Singh
fa6de7b263 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011

Change-Id: If3b2a79546e48c37a8e1494b90384b56102b8769
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 10:40:11 +00:00
Treehugger Robot
deb426263d [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-qpr-dev am: 6cf9c58fa5 -s ours am: 78d86e927c -s ours am: a81ed851af -s ours am: 34ea30a0d3 -s ours am: aa7349f210 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23603846

Change-Id: I541483291a075ae33949878d2666e4dfbf43a61e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 10:39:52 +00:00
Taran Singh
675b4b3c62 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0564ec25bb -s ours am: c07555d438 -s ours am: 56c4d2a5a5 -s ours am: 045a9bfd32 -s ours am: 417c199efa -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23603846

Change-Id: I9da4908defb622743e10fe8211167d6e95d2f3ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 10:39:50 +00:00
Treehugger Robot
c36d4dd62b [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-dev am: 9fa4b1e0a6 am: 3c039ca648 -s ours am: 2df32f537f -s ours am: 4e7bbcce82 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545222

Change-Id: Ie427ca724b62fe0434bde8457780d245bd930175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 10:39:31 +00:00
Taran Singh
cd7282da37 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: cb2b753094 am: c362ee7dc2 -s ours am: a9488a71bc -s ours am: ab11731a5b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545222

Change-Id: I6006e1f4ad5abfdccbc26fae9cf52a826cf532da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 10:39:28 +00:00
Treehugger Robot
38280de428 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-v2-dev am: 376bf07767 -s ours am: 30ea3d3cec -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605760

Change-Id: I319e9fc72a45405ebf255f0c8c710c227fe7f1fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 10:39:08 +00:00
Taran Singh
e11d0e8502 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536abc8 -s ours am: 76f3f2efe8 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605760

Change-Id: I18a4da8fdf54ba0ffb11f79beceaa8721b01e431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 10:39:06 +00:00
Treehugger Robot
66539a3cda [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce -s ours am: 2c62993aca -s ours am: 71bf0d7467 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250

Change-Id: Ia8d3021b6416c446432b38dabdeff2e566831cc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 10:38:50 +00:00
Taran Singh
7fa313e00e [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583 -s ours am: a8bd8948d1 -s ours am: 02ef9c46ec -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250

Change-Id: I4a89c8243a4f40b07a61724747757039741ddc97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 10:38:48 +00:00
Treehugger Robot
000cdf1b5d Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068

Change-Id: I79b66024b8a6411f289270d19416d08849c81746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 10:38:21 +00:00
Taran Singh
fdf0f64b90 DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068

Change-Id: I46dae6492ca7512344dee008c782f20a49f700e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 10:38:16 +00:00
JW Wang
73dcb47ecb Extract common code to SaveChosenLockWorkerBase 
* Extract common code of ChooseLockPassword.SaveAndFinishWorker and
ChooseLockPattern.SaveAndFinishWorker to the parent class.

* Make setters return this to make it easy to chain setter calls.

* Rename SaveChosenLockWorkerBase to SaveAndFinishWorker.

This will make the code changes in the next CL much easier.

Bug: 271968977
Bug: 277561275
Test: 1. Add screen lock (password/PIN/pattern) using Settings
      2. check screen lock works correctly
Change-Id: I98acd25f2dd81ab4608cc6943e4f238070003c17
 2023-07-12 05:33:15 +00:00
Bill Yi
05c15f8e73 Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE 
Merged-In: I2d14107a37340b8b34ae71c67f7f705a272324b9
I2d14107a37340b8b34ae71c67f7f705a272324b9
Merged-In: I302a25ff6f386b4b533354fcb841abd01aa1d837
I302a25ff6f386b4b533354fcb841abd01aa1d837
Merged-In: Idd06d93032c0616c59f6f9738a2f5dea9fc9e53c
Idd06d93032c0616c59f6f9738a2f5dea9fc9e53c

Change-Id: Ie7d523720aff6d3ac1879130df097474e417d215
 2023-07-11 15:30:02 -07:00
Joshua McCloskey
5a4211ec82 Implement basic Fingerprint functionality. 
Test: Verified enroll/deletion/renaming/authentication flows.
Test: atest FingerprintSettingsViewModelTest
Test: atest FingerprintManagerInteractorTest
Bug: 280862076
Change-Id: Ic34fd89f01f24468d0f769ef0492e742d9330112
 2023-07-11 20:46:43 +00:00
Joshua McCloskey
b7f0d7a8ff Moving FingerprintSettings to Kotlin 
This change is the first of many, it will

1. Change java -> kotlin
2. Use the MVVM architecture
3. Be feature flagged

This change in particular is focused on transitions to and from various activities.

Enable feature via
adb shell setprop sys.fflag.override.settings_biometrics2_fingerprint true

Bug: 280862076
Test: atest FingerprintSettingsViewModelTest
Change-Id: I8eb5c30e6f2e92c256ae7c257a9d560439ba418f
Merged-In: I8eb5c30e6f2e92c256ae7c257a9d560439ba418f
 2023-07-11 17:43:07 +00:00
SongFerng Wang
340d592bbf Merge "Revert "Revert "Update the wording for LE Audio""" into udc-qpr-dev am: 997ef1e5b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018266

Change-Id: Iac910dd53cfa1ee4b67548d7cfd025c6809a88e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 14:14:27 +00:00
SongFerng Wang
997ef1e5b3 Merge "Revert "Revert "Update the wording for LE Audio""" into udc-qpr-dev 2023-07-11 13:33:14 +00:00
lbill
7f8197da82 Update screen lock and biometrics options in order 
Previously the screen lock and biometrics order is :
UI & UX: b/182806496, b/183649070
- PIN • Face • Fingerprint
- Pattern • Face • Fingerprint
- Password • Face • Fingerprint

By requirement, we need to reverse Fingerprint & Face position
- PIN • Fingerprint • Face
- Pattern • Fingerprint • Face
- Password • Fingerprint • Face

Also remove unused strings

Fixes: 242143765
Test: Manual login corp, and observe the UI in Choose screen lock
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Change-Id: I1938f867360512121ecfdae8e2ca6de7002156f4
 2023-07-11 12:30:22 +00:00
Daniel Huang
73b2b137cc Merge "Use EXTRA_ENTRYPOINT to log entry point for metrics" into udc-qpr-dev am: 2b40635f07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913078

Change-Id: Iad5339178401ca44b5e36f16e9509efec088c3b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 09:18:48 +00:00
Chaohui Wang
d9e7141a78 Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev am: fe38ff963a am: 1806b3032f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23939155

Change-Id: Ia06c3c91c64a40300f0468ab0cc6208a169bdbdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 09:18:22 +00:00
Chaohui Wang
fc275fef2e Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev am: fe38ff963a am: 47803f6b10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23939155

Change-Id: I624e8cf060dae2dfb7a1b0b06c4610adeeddde79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 09:12:13 +00:00
Daniel Huang
2b40635f07 Merge "Use EXTRA_ENTRYPOINT to log entry point for metrics" into udc-qpr-dev 2023-07-11 09:09:03 +00:00
Chaohui Wang
1806b3032f Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev am: fe38ff963a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23939155

Change-Id: I46c9e35554f3a7021bb52c79cc73e09971ca4232
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 08:34:42 +00:00
Chaohui Wang
47803f6b10 Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev am: fe38ff963a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23939155

Change-Id: I159db196a31270e20a213796e8236eb9808d418a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 08:30:00 +00:00
SongFerng Wang
513f38cb17 Revert "Revert "Update the wording for LE Audio"" 
This reverts commit c123b2e5a8.

Reason for revert: Since the phase 2 launch plan was moved to next timeline at b/289884263.

Change-Id: I54ff20c0d9599da7f47e2254f721be6007a9204a
 2023-07-11 08:20:23 +00:00
Chaohui Wang
fe38ff963a Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev 2023-07-11 07:50:49 +00:00
Treehugger Robot
5c046f1d4e Merge "Add a mechanism to log battery usage periodic job events" into udc-qpr-dev am: 4ac05f8cac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23971085

Change-Id: I32334ef24562e212e8817df7792b386a61f822f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 06:52:26 +00:00
Treehugger Robot
4ac05f8cac Merge "Add a mechanism to log battery usage periodic job events" into udc-qpr-dev 2023-07-11 06:09:54 +00:00
SongFerng Wang
dbeb0fb911 Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b91f am: d3f8caa506 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913080

Change-Id: I871b3e1f3e66d9de564d1761bc160b9e5ea1e0da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 06:07:56 +00:00
SongFerng Wang
723c5e8754 Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b91f am: 96c2da1340 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913080

Change-Id: I2f10b967b2b98903e7bba9a9e0a74ab02ce1a8e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 06:02:24 +00:00
SongFerng Wang
d3f8caa506 Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b91f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913080

Change-Id: Ifd57844fa7d17836a8c681b16b8b7e1830aabfec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 05:26:45 +00:00
SongFerng Wang
96c2da1340 Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b91f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913080

Change-Id: Iabad339cd438114562b16a495f2e9c15249c38b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 05:22:21 +00:00
SongFerng Wang
717ce2b91f Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev 2023-07-11 04:55:18 +00:00
Chun-Wei Wang
05dc85a094 Merge "ChooseLockPattern: remove redundant setting of visible pattern default" into udc-qpr-dev am: c680da15c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23988224

Change-Id: Icc8a1a86241bc4e41e77e72c1d69f8d7d3d92c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 04:04:17 +00:00
Chun-Wei Wang
c680da15c3 Merge "ChooseLockPattern: remove redundant setting of visible pattern default" into udc-qpr-dev 2023-07-11 03:24:17 +00:00
Joshua Mccloskey
1c7a298038 Merge "Moving FingerprintSettings to Kotlin" into udc-qpr-dev-plus-aosp 2023-07-10 19:02:01 +00:00
Chaohui Wang
057c15c26a Fix crash when call getMobileTemplate am: 9132535e5e am: 1578772d63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328

Change-Id: I9d6300da831dff79e2ae605e59d3a3af41f48c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 09:02:44 +00:00
Chaohui Wang
dc3fc1dff0 Fix crash when call getMobileTemplate am: 9132535e5e am: f3d6684e14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328

Change-Id: Ifbeab53d402207c0cd63ab225f30af6bdc4da824
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 08:56:59 +00:00
Chaohui Wang
1578772d63 Fix crash when call getMobileTemplate am: 9132535e5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328

Change-Id: I01c40793839a7d5fbd0b7834c67184c228356c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 08:16:04 +00:00
Chaohui Wang
f3d6684e14 Fix crash when call getMobileTemplate am: 9132535e5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328

Change-Id: Ia4b74067049da536c8f98230e588b579379fdad6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 08:12:07 +00:00
Zaiyue Xue
c93fe0b509 Fix testUidCache_switchLocale_shouldCleanCache in BatteryEntryTest 
Remove unused code and test

Bug: 290318160
Fix: 290318160
Test: presubmit
Change-Id: I20c612270c67f55e0b01fa849514ba670b696db3
 2023-07-10 15:06:57 +08:00
Chaohui Wang
9132535e5e Fix crash when call getMobileTemplate 
There are 2 versions of getMobileTemplate.

The previous Change I7865823d6af2c812afa35d047bd79b60ae4b0fb7 change
from the correct version to the wrong version.

Change back to fix the issue.

Fix: 290381395
Test: manual - on Mobile Settings page
Test: unit test
Change-Id: Icb3147558176d53dc77e7bd39ab54a5dad13c12b
Merged-In: I6227f973ec38e5b0520f54a41ac2ede2929a1bcc
 2023-07-10 14:20:07 +08:00
Jason Chang
17d1e70930 Merge "Fix the “screen lock option” and password restriction view are in the wrong position on PIN/Password/Pattern in the landscape mode." into udc-qpr-dev am: 5a0d4d1cc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712165

Change-Id: I8c58292e2b93f0e827d059c44046002d72eb772b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 03:41:17 +00:00