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

110577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Android Build Coastguard Worker
be546ea2fd Snap for 9121707 from 43ceaa85ee to tm-qpr1-release 
Change-Id: I042f61805dfae017b0308bbb36dbfc19fa8b50c7
 2022-09-29 23:26:33 +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
TreeHugger Robot
dbf2abbc34 [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 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: I7fc4fa7a292b42925d1513419aecacb03451a982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 23:56:38 +00:00
Milton Wu
c67009349d [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 skip reason: subject contains skip directive

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

Change-Id: I8044661be70d553e25fdcf3aa423af92c0feda5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 23:56:37 +00:00
TreeHugger Robot
e9c3d6d456 [automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7 -s ours am: 4f3cd58c02 -s ours am: 4840155935 -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: I4ef3ec259a7abe96374401f2ea8f199cb266f43c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 23:56:18 +00:00
Milton Wu
d3f7bdbed9 [automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb 2p: 353e941920 am: 9e76d2c1fb -s ours am: 14584ec665 -s ours am: b23f6838de -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: If0ce11df4f8b0766dd141e2dbcacb2523e43c7ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 23:56:16 +00:00
TreeHugger Robot
a823a034fa [automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7 -s ours am: 4f3cd58c02 -s ours am: 240745ee63 -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: I6a6e4c1ca0e34c58be6a7cb397364de5c387b579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 23:54:41 +00:00
Milton Wu
f1e7e8ff81 [automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb 2p: 353e941920 am: 9e76d2c1fb -s ours am: 14584ec665 -s ours am: d9cc9813c3 -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: Ia0d1ce6d2180c737f9190b98040db8c4b592f3b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 23:54:36 +00:00
TreeHugger Robot
6a6678facd [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 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: I0d7b3e60ee881745125ddce0245f3376b9040640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 23:53:57 +00:00
Milton Wu
b5f2fe917e [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 skip reason: subject contains skip directive

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

Change-Id: I8bb019a8d0ee5d66d1d07c5561c2ce9c224c713e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 23:53:52 +00:00
Automerger Merge Worker
16fa021560 Merge changes from topic "am-6a80ad22a95146729ffb32509025cb72" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7 -s ours am: 3a28ab401b -s ours
  [automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb 2p: 353e941920 am: 9e76d2c1fb -s ours am: 6cfd8c6aa3 -s ours
 2022-09-28 23:27:47 +00:00
TreeHugger Robot
04041d515c [automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7 -s ours am: 3a28ab401b -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: I4501cfd8020c5b0e135ff2374f1e54461493b94c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 23:27:43 +00:00
Milton Wu
32b02f233d [automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb 2p: 353e941920 am: 9e76d2c1fb -s ours am: 6cfd8c6aa3 -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: I6b33dd1e99d83fe4636600f7f2d4934b5ec49c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 23:27:42 +00:00
TreeHugger Robot
4840155935 [automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7 -s ours am: 4f3cd58c02 -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: I955241f19b1fa1b0d012e3a69ce507aa7aaac003
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 23:27:41 +00:00
Milton Wu
b23f6838de [automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb 2p: 353e941920 am: 9e76d2c1fb -s ours am: 14584ec665 -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: I65a751953bfccc8e964b54a070606edd6b290113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 23:27:39 +00:00
TreeHugger Robot
240745ee63 [automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7 -s ours am: 4f3cd58c02 -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: I66012bf2ae40ebe67bb874663b5123867e80700a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 23:27:38 +00:00
Milton Wu
d9cc9813c3 [automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb 2p: 353e941920 am: 9e76d2c1fb -s ours am: 14584ec665 -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: I7aa21e8994679c4a90fbc590f2caa080983cb7d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 23:27:37 +00:00