Bill Yi
d1da0de9ee
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9d068e8112bd285385013841c3bd05df2abe4a79
2022-09-29 18:40:46 -07:00
TreeHugger Robot
6cc1b77003
[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: I9b490c272aca991383f2a2d65f963ee33ac105b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:55:39 +00:00
Milton Wu
a8431fcaf6
[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: Ie3037847e57182ec94131b73c35e7cfe4b0e204a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:55:38 +00:00
TreeHugger Robot
f2f310cdf1
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev am: 80f5fd3836
-s ours am: 785e311159
-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: I26feba1ff77c83e08c57817dd36574b7b7218472
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:24:53 +00:00
Milton Wu
34d43eb70f
[automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
am: 3f02770332
-s ours am: fcffcdd692
-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: Ib0958dfb6feb7edf36142450b8998a079ede6277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:24:49 +00:00
TreeHugger Robot
785e311159
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev am: 80f5fd3836
-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: Ia4267770be69e08e5e4094a092659b8e1d4625e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 22:59:28 +00:00
Milton Wu
fcffcdd692
[automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
am: 3f02770332
-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: I5d4a93f2029eb1ab012fb421874882a5ad699459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 22:59:27 +00:00
TreeHugger Robot
526fe84452
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7
-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: I088200b7e34a0075828ef2cb5251ef1be22839c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 22:58:28 +00:00
Milton Wu
68aeb6639b
[automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
2p: 353e941920
am: 9e76d2c1fb
-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: I6c346ba06234fb12dd71d281432d97711d6c681c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 22:58:26 +00:00
TreeHugger Robot
80f5fd3836
Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev
...
* changes:
[automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern
2022-09-28 22:37:17 +00:00
TreeHugger Robot
7429f710f7
Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev
...
* changes:
[automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
2p: 353e941920
[automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern
2022-09-28 22:37:17 +00:00
Milton Wu
14ed9ab1c4
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9
-s ours am: 5561341091
-s ours am: 8da95c29a9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961564
Change-Id: I116c387de73cb514b83ba05fdbf47512e331a790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:23:49 +00:00
Milton Wu
8da95c29a9
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9
-s ours am: 5561341091
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961564
Change-Id: If075061207ed359f26ec3a597792329d77bc537a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:53:17 +00:00
Milton Wu
5561341091
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961564
Change-Id: Icfaa44c53c3f78950a453879f34d27ff8aa88bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:42:15 +00:00
Milton Wu
529896f004
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: 27bddff2ac
-s ours am: ed094b353b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961565
Change-Id: I5c01bb7bf2c8f825f14529505f9927b61b111178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:42:07 +00:00
TreeHugger Robot
9983c28b67
Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev am: eaabdee25c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566
Change-Id: Ic8aa190849303e9684657fd67fc93a010e270b39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:41:52 +00:00
Milton Wu
4cc7080b4f
[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: aac79b894f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566
Change-Id: Ib9ad45c802a510fbd6bac8bbadbba145a8a985f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:41:50 +00:00
Milton Wu
ed094b353b
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: 27bddff2ac
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961565
Change-Id: I911ef7db2860485823aa86c8c79e037b3db45389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:39:23 +00:00
TreeHugger Robot
eaabdee25c
Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev
2022-09-28 03:05:56 +00:00
Bill Yi
614c7886f0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbe25724d6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20035804
Change-Id: Ib40f7f5e61b34fbf596453da02f691ae02e6555a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-27 17:55:39 +00:00
Bill Yi
9404d72552
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c46e0e3d6e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20035804
Change-Id: I0e3340ce39e0e885a737433c8b2fb13c21ee56f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-27 17:55:27 +00:00
Bill Yi
4cd061602c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aae182edf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20035381
Change-Id: I13948e83c8f1f905acca7ed4b012241dd8e43c5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-27 17:55:14 +00:00
Bill Yi
dbe25724d6
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-09-27 17:11:14 +00:00
Bill Yi
d14b388366
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-09-27 00:41:11 +00:00
Bill Yi
4aae182edf
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6820f433e9bc4442d0dce43f543563b3797ccfd4
2022-09-23 01:03:30 -07:00
Bill Yi
c46e0e3d6e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If66addd4f08126800df1980cf1adba4cd71788e1
2022-09-23 00:58:17 -07:00
Bill Yi
c262175b3c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic95f826a9d15e46a6ba2543659b5e01c292f0bab
2022-09-23 00:56:12 -07:00
Bill Yi
61485ad3cb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifaef026541f8fd24c8c2c1476cb22f5024b25dac
2022-09-23 00:53:12 -07:00
TreeHugger Robot
89fec1854b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: Ifade04be3c936132abd283a1d3e6401cd6acdefa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:32:14 +00:00
Bill Yi
514c6d557c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f340b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19998244
Change-Id: I65ea8bbad09d82b263374757fd1fdb994dd59619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:31:57 +00:00
Bill Yi
9d95e8ecc0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997562
Change-Id: I99e72c81280070621509fc66ca1246aa0c345027
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-21 21:31:45 +00:00
Bill Yi
9b31b981ef
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-09-21 14:22:42 +00:00
TreeHugger Robot
7c21f2eaa6
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-09-20 23:20:11 +00:00
Bill Yi
5c3d8f340b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I985329532c210b25458142a2c0fb637056ba384e
2022-09-19 20:37:28 -07:00
Bill Yi
6a44c6afa3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3ddd1cecee3dbd09bb5fb12541666e3ec09d0b1f
2022-09-19 20:31:46 -07:00
Bill Yi
7d4259833d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iecd63b8ec0750ce187be050be22cec1ebb724b72
2022-09-19 20:29:25 -07:00
Bill Yi
66d46968f6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2c220d73ce130f2bba3ecc39ec8936eb3b294ec3
2022-09-19 20:26:25 -07:00
Milton Wu
aac79b894f
[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern
...
Prevent ChooseLockPassword and ChooseLockPatten being projected to
remote views, add FLAG_SECURE for these screens.
Bug: 179725730
Test: Check these 2 screens not projected to chromecast
Test: robo test for SetupChooseLockPatternTest ChooseLockPatternTest
SetupChooseLockPasswordTest ChooseLockPasswordTest
Change-Id: I7449a24427c966c1aa4280a7b7e7e70b60997cca
Merged-In: I7449a24427c966c1aa4280a7b7e7e70b60997cca
(cherry picked from commit 98239c0da6
)
2022-09-15 07:02:13 +00:00
Milton Wu
27bddff2ac
[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern
...
Prevent ChooseLockPassword and ChooseLockPatten being projected to
remote views, add FLAG_SECURE for these screens.
Bug: 179725730
Test: Check these 2 screens not projected to chromecast
Test: robo test for SetupChooseLockPatternTest ChooseLockPatternTest
SetupChooseLockPasswordTest ChooseLockPasswordTest
Change-Id: I7449a24427c966c1aa4280a7b7e7e70b60997cca
Merged-In: I7449a24427c966c1aa4280a7b7e7e70b60997cca
(cherry picked from commit 98239c0da6
)
2022-09-15 07:00:35 +00:00
Milton Wu
d5771108b9
[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern
...
Prevent ChooseLockPassword and ChooseLockPatten being projected to
remote views, add FLAG_SECURE for these screens.
Bug: 179725730
Test: Check these 2 screens not projected to chromecast
Test: robo test for SetupChooseLockPatternTest ChooseLockPatternTest
SetupChooseLockPasswordTest ChooseLockPasswordTest
Change-Id: I7449a24427c966c1aa4280a7b7e7e70b60997cca
Merged-In: I7449a24427c966c1aa4280a7b7e7e70b60997cca
(cherry picked from commit 98239c0da6
)
2022-09-15 06:59:11 +00:00
Milton Wu
9e76d2c1fb
[automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
2p: 353e941920
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Bug: 179725730
Change-Id: I561ceec3d0b58d7db5feaf5d2847acc0f88ace65
Merged-In: I7449a24427c966c1aa4280a7b7e7e70b60997cca
2022-09-15 06:58:02 +00:00
Milton Wu
3f02770332
[automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Bug: 179725730
Change-Id: If1f5f223ce35e9eb7d038523dd663c8849426070
Merged-In: I7449a24427c966c1aa4280a7b7e7e70b60997cca
2022-09-15 06:57:50 +00:00
Milton Wu
353e941920
[automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Bug: 179725730
Change-Id: I131ea5ef5f47a8f34d4f8066d3851c9e8b6826af
Merged-In: I7449a24427c966c1aa4280a7b7e7e70b60997cca
2022-09-15 06:57:50 +00:00
Milton Wu
98e3bfdebb
[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern
...
Prevent ChooseLockPassword and ChooseLockPatten being projected to
remote views, add FLAG_SECURE for these screens.
Bug: 179725730
Test: Check these 2 screens not projected to chromecast
Test: robo test for SetupChooseLockPatternTest ChooseLockPatternTest
SetupChooseLockPasswordTest ChooseLockPasswordTest
Change-Id: I7449a24427c966c1aa4280a7b7e7e70b60997cca
Merged-In: I7449a24427c966c1aa4280a7b7e7e70b60997cca
(cherry picked from commit 98239c0da6
)
2022-09-15 06:57:35 +00:00
TreeHugger Robot
ca6138e6b8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: I2b18a6b2df07cee43045a0f33d4566d63ba1e01f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:11:24 +00:00
Bill Yi
40dbc67c91
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036
Change-Id: I4130101fdc714dc0d4f53b54a06b0d5739c721d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:11:12 +00:00
Bill Yi
c76428d937
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925032
Change-Id: I1c0fbcb9c835fbf176cc04949288d1ef9557fb48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-13 18:10:58 +00:00
TreeHugger Robot
d04dc24d56
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-09-13 17:20:55 +00:00
TreeHugger Robot
a95e746231
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-09-13 16:53:33 +00:00
Bill Yi
a4f092c748
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie871e5bb344fce432b8741e50b34954cf5fc6ec9
2022-09-11 16:28:01 -07:00