PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,242 Commits 1 Branch 0 Tags
7a3ba54d23671405d0a87f95d257f1d8307d037c
Commit Graph

110242 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
7a3ba54d23 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ce9e908f9 -s ours am: 567c6dd3ca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib340ffec431f5a77e5b181830192ec9516c8d8a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-02 08:23:25 +00:00
TreeHugger Robot
1f0962c3c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5b8a3aabaa -s ours am: db09b990a0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic00f62d2e84db365ddfcd3eb0d629c1da51f1de2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-02 08:21:26 +00:00
Bill Yi
02fa63e2fc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ce9e908f9 -s ours am: 0aca2c219d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I81058835048aa75939c95147f0a8b71dc19584bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-02 08:21:09 +00:00
TreeHugger Robot
db09b990a0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5b8a3aabaa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I91e0858307d1055b300a67ae7ba22b9897bac4b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-02 07:54:31 +00:00
Bill Yi
567c6dd3ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ce9e908f9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0c47748f2ea5d2e6691937acee6c91d96bcc5122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-02 07:54:12 +00:00
Bill Yi
0aca2c219d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ce9e908f9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6dd06d608b1b319d2214514a145b7c178378bbd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-02 07:54:11 +00:00
TreeHugger Robot
5b8a3aabaa Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-10-02 07:26:20 +00:00
Bill Lin
6b763d1999 Merge "Do not override SUW Glif theme when onApplyThemeResource() callback" into tm-qpr-dev am: e5a4e38c8c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20080179

Change-Id: I5a16ac472b0a08273d2410b39741675a6f998f51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-01 00:22:29 +00:00
Bill Lin
e5a4e38c8c Merge "Do not override SUW Glif theme when onApplyThemeResource() callback" into tm-qpr-dev 2022-09-30 23:54:31 +00:00
Bill Yi
ba331be678 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368 -s ours am: 4bf99a1f0f -s ours am: 148f0a8591 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I59052a6cddf76148650c3def3f875a3c7f3650ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 21:40:34 +00:00
Bill Yi
6c8ff68ac2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368 -s ours am: 6cf6175ec3 -s ours am: 3a2a9c27a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6b48eeedb2292e93045ca38617113ee3ccb62e91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 21:17:07 +00:00
Bill Yi
e6d49db2fc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368 -s ours am: 4bf99a1f0f -s ours am: e7722ef90c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5f00df6d8bf3d9543a1d41c96af4f8a1ee7b911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 21:08:39 +00:00
Bill Yi
148f0a8591 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368 -s ours am: 4bf99a1f0f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I07f8debb98eeee861b53234a5e1ea81d22e24a31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 20:57:39 +00:00
Bill Yi
e7722ef90c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368 -s ours am: 4bf99a1f0f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice33ed5798d03b887d2d0feb637ddeb37223c7d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 20:56:21 +00:00
Bill Yi
3a2a9c27a2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368 -s ours am: 6cf6175ec3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaa63d8f87752e9f593cc5f79a4d87116a86f6239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 20:48:01 +00:00
Bill Yi
4bf99a1f0f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I494de493df292a1ae0cb827d75b1a3458f4c65b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 20:46:53 +00:00
Bill Yi
6cf6175ec3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib3d599dccb4076c42bc05cfbdec0036e72ec9177
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 20:44:09 +00:00
TreeHugger Robot
2525056f1d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 12a1ed5662 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea8b7d3d8ac230245faf4d58b3692ed99702dcef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 18:44:32 +00:00
Bill Yi
6ba4170976 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf54fdb73b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d9fc13a34443adb3241eab58c2e8f9d2c770169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 18:44:20 +00:00
TreeHugger Robot
12a1ed5662 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-30 18:14:33 +00:00
Grace Cheng
b20a0ed55f Merge "Show lottie on non-default display density on SFPS" into tm-qpr-dev am: c6d9164dd4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20083885

Change-Id: Iea3e8fd7e16fdd4af2b9a2bde3ea5991e3fabffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 17:34:25 +00:00
Grace Cheng
c6d9164dd4 Merge "Show lottie on non-default display density on SFPS" into tm-qpr-dev 2022-09-30 17:05:30 +00:00
lbill
39175b2f87 Do not override SUW Glif theme when onApplyThemeResource() callback 
1. Accodring to settings & setupdesign lib theme architecture
Only force apply sytle SetupWizardPartnerResource for current
activity/contextThemeWrapper is sufficient, override GlifV3Theme
again will cause incorrect resource mapping of private attributes.

2. Set Theme_AlertDialog style for AlertDialog in for Material design
- FingerprintEnrollEnrolling
- FingerprintEnrollFindSensor

3. Add test for AlertDialog theme, and fix broken test cases

Fixes: 245684949
Bug: 249789759
Bug: 248994476
Test: manual in SUW `adb shell cmd uimode night yes` and check visual
Test: manual in SUW enrolling check timeout dialog apply theme
Test: manual in SUW enroll UDFPS tips lottie view showing expectedly
Test: manual in SUW enroll UDFPS landscape showing correct layout
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
      SetupFingerprintEnrollFindSensorTest
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
      FingerprintEnrollEnrollingTest
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
      FingerprintEnrollFindSensorTest
Change-Id: I17cbf26e38318e6681ba124d23bf86317a0f1e1d
 2022-09-30 04:58:28 +00:00
Bill Yi
3ce9e908f9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibb582089c3601dcd3dc8e5c47d36da97b0be9c0d
 2022-09-29 18:57:44 -07:00
Bill Yi
cf54fdb73b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I095695f0dfaf97b6944010e51b3b1463c3b7fbb0
 2022-09-29 18:54:45 -07:00
Bill Yi
e289b0f368 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9a1027d900d021590709e82299a9dee0533e380d
 2022-09-29 18:51:56 -07:00
PETER LIANG
a3e3790a73 Merge "Fix that when I go to display size in the settings, the largest size shows the smallest icons." into tm-qpr-dev am: 937821f30f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20067817

Change-Id: I13053b63fe2ee106b558fdc40488140d200acd9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 00:30:49 +00:00
PETER LIANG
937821f30f Merge "Fix that when I go to display size in the settings, the largest size shows the smallest icons." into tm-qpr-dev 2022-09-30 00:00:14 +00:00
Grace Cheng
3ebab337b9 Merge "Fixes DT enrollment asset showing in light mode" into tm-qpr-dev am: 6b27a8bb70 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20083884

Change-Id: Ib445daafd58314954ea095e4adb8e351a454b30f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 23:49:09 +00:00
Grace Cheng
6b27a8bb70 Merge "Fixes DT enrollment asset showing in light mode" into tm-qpr-dev 2022-09-29 23:29:30 +00:00
Grace Cheng
6c72ef89b2 Show lottie on non-default display density on SFPS 
Continue showing lottie when text size/display size is changed on SFPS, because unlike C10/P10, lottie will not overlap text on SFPS

Test: (manual) Change display size and text size to max, verify lottie is visible and does not overlap text
Fixes: 245029066
Change-Id: I041415abc21722052a9adbdc927847c42cd7619f
 2022-09-29 19:42:59 +00:00
Grace Cheng
990af9ea7a Fixes DT enrollment asset showing in light mode 
Moves DT->LT dynamic color mapping call to after animation asset is set

Test: (manual) In light mode, advance past fingerprint enrollment edu screen and hit back button, observe correct LT asset
Fixes: 246233066
Change-Id: I5425f57b151a6f586338497ee0e5bf247af55f6e
 2022-09-29 17:47:33 +00:00
Tom Hsu
f0635482c7 Merge "Revert "[Languages] Add new information to system language page."" into tm-qpr-dev am: 43ceaa85ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20064133

Change-Id: Ie4a6ec648a8a524d25f44dca22cbc145884c664b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 16:27:06 +00:00
Tom Hsu
43ceaa85ee Merge "Revert "[Languages] Add new information to system language page."" into tm-qpr-dev 2022-09-29 15:52:32 +00:00
Peter Liang
8ca60482c2 Fix that when I go to display size in the settings, the largest size shows the smallest icons. 
Root cause:
Preview didn't instantly be updated when scrolling the Display size.

Solution:
Get the value from preferences when scrolling, and from the display size data value when initializing.

Fix: 248748575
Test: manual test
Change-Id: I441766e0fd97ec1ac287d5bd4191693b2490c552
 2022-09-29 06:23:32 +00:00
Tom Hsu
a4c78e3820 Revert "[Languages] Add new information to system language page." 
This reverts commit 3cbb6f8680.

Reason for revert: b/248456615

Change-Id: I3bc5088784ed97f69ffadb0ea69078bfcf7dc39d
Merged-In: I3bc5088784ed97f69ffadb0ea69078bfcf7dc39d
 2022-09-29 04:38:30 +00:00
TreeHugger Robot
307397c2b9 [automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev am: 80f5fd3836 -s ours am: 785e311159 -s ours am: f2f310cdf1 -s ours am: 6a6678facd -s ours am: 950a4c565e -s ours 
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9 is already in history

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

Change-Id: I686ac8cb14acf01af3a635363e17955ccbaf00c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 00:58:24 +00:00
Milton Wu
9ac3008b45 [automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb am: 3f02770332 -s ours am: fcffcdd692 -s ours am: 34d43eb70f -s ours am: b5f2fe917e -s ours am: 0110ac23ed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie8eb89367dd28f8b2710f01312edcb5f52f8a9b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 00:58:22 +00:00
TreeHugger Robot
927ec6296d [automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev am: 80f5fd3836 -s ours am: 785e311159 -s ours am: f2f310cdf1 -s ours am: dbf2abbc34 -s ours am: 5af257139e -s ours 
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9 is already in history

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

Change-Id: Ib133f87aa9832b16ffcf3b1ff3f3c7c1cf8134f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 00:55:15 +00:00
Milton Wu
b22323fb7b [automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb am: 3f02770332 -s ours am: fcffcdd692 -s ours am: 34d43eb70f -s ours am: c67009349d -s ours am: 8175292d47 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8a8966750125811ae93a9906fc2f37da1f221e2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 00:55:13 +00:00
TreeHugger Robot
333c8b33f5 [automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev am: 80f5fd3836 -s ours am: 785e311159 -s ours am: f2f310cdf1 -s ours am: dbf2abbc34 -s ours am: 2be7d6f16b -s ours 
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9 is already in history

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

Change-Id: I7deb667d2aa1d392a2bf8a9bd1930c32a9377183
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 00:53:59 +00:00
Milton Wu
05d3396cf5 [automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb am: 3f02770332 -s ours am: fcffcdd692 -s ours am: 34d43eb70f -s ours am: c67009349d -s ours am: 57368a950e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99e400b57154d922ce2e0dc13724fd4cfd706a50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 00:53:54 +00:00
TreeHugger Robot
950a4c565e [automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev am: 80f5fd3836 -s ours am: 785e311159 -s ours am: f2f310cdf1 -s ours am: 6a6678facd -s ours 
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9 is already in history

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

Change-Id: I6393e3c960f770726343e223f82674bf181dd451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 00:26:50 +00:00
Milton Wu
0110ac23ed [automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb am: 3f02770332 -s ours am: fcffcdd692 -s ours am: 34d43eb70f -s ours am: b5f2fe917e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If637a1821d3731cf0320601b4cba2de69e6e1872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 00:26:49 +00:00
TreeHugger Robot
5af257139e [automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev am: 80f5fd3836 -s ours am: 785e311159 -s ours am: f2f310cdf1 -s ours am: dbf2abbc34 -s ours 
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9 is already in history

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

Change-Id: Ib90d7fe5a79107050714fff2796dfe77e6bec784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 00:26:23 +00:00
TreeHugger Robot
2be7d6f16b [automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev am: 80f5fd3836 -s ours am: 785e311159 -s ours am: f2f310cdf1 -s ours am: dbf2abbc34 -s ours 
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9 is already in history

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

Change-Id: I683f9b0338560c2cb26f040f1990e6fc564e33ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 00:26:21 +00:00
Milton Wu
8175292d47 [automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb am: 3f02770332 -s ours am: fcffcdd692 -s ours am: 34d43eb70f -s ours am: c67009349d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ce731768dc5a5f4df6ecf20732b6bb2f169a0fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 00:26:21 +00:00
Milton Wu
57368a950e [automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb am: 3f02770332 -s ours am: fcffcdd692 -s ours am: 34d43eb70f -s ours am: c67009349d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia7986779a2bc1cc0c2ff293af90593561fbeba6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 00:26:20 +00:00
Automerger Merge Worker
b98e4f8c85 Merge changes from topic "am-6a80ad22a95146729ffb32509025cb72" into tm-d1-dev-plus-aosp am: 16fa021560 -s ours 
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 98e3bfdebb is already in history

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

Change-Id: I80ae957243e9b35002bb22b88d42cf9130f7fd98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 00:11:26 +00:00
TreeHugger Robot
459fb0b5a1 [automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7 -s ours am: 3a28ab401b -s ours am: 04041d515c -s ours 
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9 is already in history

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

Change-Id: I3d062738cd130ae8a8eed2dc52ab8b21a242bb16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 00:11:21 +00:00