PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
116,490 Commits 1 Branch 0 Tags
a76fb7af27ba992bf7d01bbd6037f0daeb307fa7
Commit Graph

116490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
a76fb7af27 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf54fdb73b -s ours am: 6ba4170976 -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: I18234da68c32ee9eb2a4e592975de95dc6cc0a71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 19:17:45 +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
Grace Cheng
5772172b62 Merge "Show lottie on non-default display density on SFPS" into tm-qpr-dev am: c6d9164dd4 am: b20a0ed55f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20083885

Change-Id: I4ff2962c01ecc070194d26942aa635c95a8be3fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 18:09:22 +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
Joonhun Shin
23f15f80e1 Merge "changed return value METRICS_CATEGORY_UNKNOWN to SETTINGS_CONTACT_DISCOVERY" 2022-09-30 05:14:41 +00: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
PETER LIANG
0039fb35cd 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 am: a3e3790a73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20067817

Change-Id: I9deea489564aea71955570ea6f125f13c60f61ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 01:02:44 +00: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
Grace Cheng
27a52f5055 Merge "Fixes DT enrollment asset showing in light mode" into tm-qpr-dev am: 6b27a8bb70 am: 3ebab337b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20083884

Change-Id: Ib76f9b2f4196b5de281285639dc29b07a99b0356
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-30 00:19:06 +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
95d0ec1b00 [automerger skipped] Merge "Revert "[Languages] Add new information to system language page."" into tm-qpr-dev am: 43ceaa85ee am: f0635482c7 -s ours 
am skip reason: Merged-In I3bc5088784ed97f69ffadb0ea69078bfcf7dc39d with SHA-1 2f753c7ba7 is already in history

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

Change-Id: I34aeba0eaf9fcad70fb57b09a85bcb1c86d0b487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 16:59:42 +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
Viesturs Zarins
972cb57846 Merge "Fix fragment class for WIFI_SAVED_NETWORK_SETTINGS. Has been broken since the old access points implementation was deleted." 2022-09-29 12:37:45 +00:00
Chaohui Wang
7b61876ae3 Merge "Add uninstall updates & uninstall for all users" 2022-09-29 10:39:39 +00:00
Viesturs Zarins
f1d115c38e Fix fragment class for WIFI_SAVED_NETWORK_SETTINGS. 
Has been broken since the old access points implementation was deleted.

Change-Id: I8575e6f79644d0a79de9e041cb30b0ccbc0e57d3
Bug: 246772836
 2022-09-29 09:36:50 +00:00
Tom Hsu
6dbf883bd8 Merge "Revert "[Languages] Add new information to system language page."" 2022-09-29 09:08:09 +00:00
Tim Peng
2a51ffb68b Merge "single component HFP device has no battery info in the Device details page" 2022-09-29 08:28:40 +00:00
timhypeng
7c4e04b187 single component HFP device has no battery info in the Device details page 
-get full summary when the metadata does not contain the battery
information
-remove unexpected "test_summary" text

Bug: 237594992
Test: make -j50 RunSettingsGoogleRoboTests ROBOTEST_FILTER=AppBypassBroadcastReceiverTest

Change-Id: I3e3682cf88cdd147d4b7cd68f37f5e33f01c788d
 2022-09-29 08:27:33 +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
Chaohui Wang
9b65b1583d Add uninstall updates & uninstall for all users 
These are the items in the more options of App Settings page.

Uninstall updates only shows up for updated system app.

Uninstall for all users only shows up for primary user when a non-system
app is installed on multiple users.

Bug: 236346018
Test: Manual on App Settings page
Change-Id: I7530ce5215ed921c0a2b767dce56cbfd9a2b0137
 2022-09-29 13:20:03 +08: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
Tom Hsu
2f753c7ba7 Revert "[Languages] Add new information to system language page." 
This reverts commit 3cbb6f8680.

Reason for revert: b/248456615

Bug: b/248456615
Test: Manual test pass

Change-Id: I3bc5088784ed97f69ffadb0ea69078bfcf7dc39d
 2022-09-29 04:01:03 +00:00
Chaohui Wang
7075bc4faa Merge "Add install & clear app button for instant app" 2022-09-29 03:10:43 +00:00
Chaohui Wang
9fa903d728 Merge "Fix app launch button not shown" 2022-09-29 01:40:56 +00:00
TreeHugger Robot
a758e74d9d [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: 307397c2b9 -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: I9135165a3277f66e550bac7f98ec8954c48ee11c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 01:31:09 +00:00
Milton Wu
c274240c94 [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: 9ac3008b45 -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: I30d5bf89ebbe7268144914245302bac35cf99d01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 01:31:07 +00:00
TreeHugger Robot
c400611d59 [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: 927ec6296d -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: Ib7fba416c01a189ee0dc71f8ef33361cf007a4ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 01:28:56 +00:00
Milton Wu
bb92074cda [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: b22323fb7b -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: I4ba6944eb2c6ee00a66b6e38f9618b7805940368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 01:28:54 +00:00
TreeHugger Robot
d842c5acc8 [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: 333c8b33f5 -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: I371aaa2945b4b167266593584580873e7bd1e137
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 01:27:19 +00:00
Milton Wu
b77ad156c7 [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: 05d3396cf5 -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: I891ecb3fc49140ecc363d3a3988494a16bca652f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 01:27:16 +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
Automerger Merge Worker
56753e3cb3 [automerger skipped] Merge changes from topic "am-6a80ad22a95146729ffb32509025cb72" into tm-d1-dev-plus-aosp am: 16fa021560 -s ours am: b98e4f8c85 -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: Ied12a976e39308cff0efee40e3baf83fbabdd8e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 00:29:39 +00:00
TreeHugger Robot
0433a018a9 [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: 459fb0b5a1 -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: Ic155d96b0164645a836374afa812bfe5b99f194b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 00:29:37 +00:00
TreeHugger Robot
f55e2f1e29 [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: e9c3d6d456 -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: I14a2d39e9f11dcbd78f78959651f633f617e5ba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 00:29:12 +00:00
Milton Wu
652ecbd5f8 [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: d3f7bdbed9 -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: I161ba45d3d9d169617580c54d22f3c11b8841ab3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 00:29:11 +00:00
TreeHugger Robot
c3696ad21e [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: a823a034fa -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: I72d852e60bb1eb6a93d04fcc983854610f18d1da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 00:28:35 +00:00
Milton Wu
33bbcbffbf [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: f1e7e8ff81 -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: I8ac735ecdab4c2210f902590b79a76db7adc7667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-29 00:28:30 +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