Himanshu Rawat
12705de9c8
[automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-dev am: f073d27097
-s ours
...
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19423651
Change-Id: I2ecc3ff311794336743d574f75054bae032375e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-09 07:05:42 +00:00
Himanshu Rawat
02062edb25
[automerger skipped] Don't cancel passkey entry pairing autonomously am: d668a888f0
-s ours
...
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 c2b402bd50
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19423651
Change-Id: Ie9b244a71a6fdebe3a7b10425fe0061e23f19d19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-09 07:05:41 +00:00
Himanshu Rawat
f073d27097
Merge "Don't cancel passkey entry pairing autonomously" into tm-dev
2022-08-09 06:42:00 +00:00
Milton Wu
98239c0da6
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
2022-08-09 04:12:10 +00:00
Bill Yi
5fa5132f34
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec
-s ours am: ba8de85603
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: I7f188bc1b9e77d04ffdb1afd61d7531d8266ac63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:43:31 +00:00
Bill Yi
e52590665b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40
-s ours am: 0cf4c34624
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: I0bdafaa4f8cb1e56ff6b2ec2c7ef120c976a7cce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:43:25 +00:00
Bill Yi
c6584ab4bd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c
-s ours am: 4f7ff2683a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: I1d0ce608a264fe5c15f4037b35f911df9ff6ead8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:43:11 +00:00
Bill Yi
af74f8dfde
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc
-s ours am: 6c210588fc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: I00769191143c30e2dbaba985611c4b3ac756c478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:42:58 +00:00
Bill Yi
ba8de85603
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: I9f23ed66bce82323676cc2cad73d20cd5daad0e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:15:24 +00:00
Bill Yi
0cf4c34624
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549238
Change-Id: Iabd37d4636947ec369892943d08bae76834ae5eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:15:19 +00:00
Bill Yi
4f7ff2683a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: I7fac7bceb551704f9dcedc7b676dcdbfe9edbe0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:15:05 +00:00
Bill Yi
6c210588fc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549235
Change-Id: I6fe437ee8b46b9198b9507e3888ec6574aecf2fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 14:14:51 +00:00
Bill Yi
34848403ec
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-08-08 13:45:51 +00:00
Bill Yi
83da16166c
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-08-08 13:45:51 +00:00
TreeHugger Robot
9f195e63f4
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-08-08 07:33:18 +00:00
TreeHugger Robot
3932736a5a
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-08-08 07:33:18 +00:00
TreeHugger Robot
66c584cc0f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 074ee502db
-s ours am: 8c14b68114
-s ours am: 1e280a87bd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967
Change-Id: I8eedd54f5c1079293b2496c8cb6548503dda4774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:37:20 +00:00
TreeHugger Robot
32a0070207
Merge changes from topic "tc_change_22080720_11" into tm-dev am: 4b5e98636d
am: d326b911be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967
Change-Id: Ie059d9f986a9122a004566813fe7d0e3501917b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:37:00 +00:00
Bill Yi
2b568cf318
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680
am: b53a13a2e0
-s ours am: 6233a4ce39
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967
Change-Id: I1d2f6b84017b1cc8823c6cab9d72e46c90d7013c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:36:56 +00:00
Bill Yi
a00df58fa5
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac6564
am: 09659e52e5
-s ours am: c0cca64b22
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551899
Change-Id: Id1b126304eb0110af78c78cc0630f3fc263f7ee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:36:46 +00:00
TreeHugger Robot
21d61f272c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8089ee68b7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549241
Change-Id: Ia5747585c59e6f7ce25fdc19b51437f46f6564f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:35:10 +00:00
Bill Yi
3e11ee7541
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7aee397d84
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549241
Change-Id: Ie77e248d7175b90a5407115ed8a57717f5c93713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:34:56 +00:00
Bill Yi
8e9e3128b0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c764b4ac4f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549237
Change-Id: I1f19ea3da02dc06cde990956c82427b26167ecea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:34:40 +00:00
TreeHugger Robot
1e280a87bd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 074ee502db
-s ours am: 8c14b68114
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967
Change-Id: Iee81d0765b71b14733860263ef994286336d1206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:32:39 +00:00
TreeHugger Robot
d326b911be
Merge changes from topic "tc_change_22080720_11" into tm-dev am: 4b5e98636d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967
Change-Id: I1e2129d71f907e0a73d3b689f3b94601bc9595a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:32:18 +00:00
Bill Yi
6233a4ce39
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680
am: b53a13a2e0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967
Change-Id: I2e30fd8f5c17c1b0c75a769eae3c5ea9362e7204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:32:13 +00:00
Bill Yi
c0cca64b22
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac6564
am: 09659e52e5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551899
Change-Id: I9dfb004a6254f78c5c9ab6a4f718deac1cc21023
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:32:06 +00:00
TreeHugger Robot
8c14b68114
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 074ee502db
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967
Change-Id: I4cb5761fe5ccb02d3ff3a18a0506ec53a2f911c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:31:56 +00:00
TreeHugger Robot
074ee502db
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-08-08 06:15:46 +00:00
TreeHugger Robot
4b5e98636d
Merge changes from topic "tc_change_22080720_11" into tm-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680
Import translations. DO NOT MERGE ANYWHERE
2022-08-08 06:15:46 +00:00
TreeHugger Robot
8089ee68b7
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-08-08 06:14:23 +00:00
Bill Yi
b53a13a2e0
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967
Change-Id: I81b0193030cd411cfb96bac41035f1108eb8d711
2022-08-08 03:46:23 +00:00
Bill Yi
09659e52e5
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac6564
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551899
Change-Id: I60ece2eb12a9bffe10f577c34e98eb2e3dab95ce
2022-08-08 03:46:19 +00:00
Bill Yi
f018579680
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic331399e2cd77e79241be5f8c894564ce5013f34
2022-08-07 16:19:51 -07:00
Bill Yi
28e5ac6564
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I547cb6a91451ece2aff22ceadc9c156cf043582c
2022-08-07 16:16:19 -07:00
Bill Yi
7aee397d84
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2bee4360c5ce826ccbebfea10137b32c2598bb8a
2022-08-07 00:10:06 -07:00
Bill Yi
9f5b4abadd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia9aa41389d98d2ce7358c3814faba6aa0849ad1e
2022-08-07 00:05:49 -07:00
Bill Yi
f52497bd40
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6f0b461048e49766d3810c8b40962610084d47ad
2022-08-07 00:01:02 -07:00
Bill Yi
c764b4ac4f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If4fff28727c9bc27e16288c71ca3a8cb85f85e1b
2022-08-06 23:56:46 -07:00
Bill Yi
c5eb7f3fa4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9610ada08254acfda511aecab450b59a622ffa5d
2022-08-06 23:54:57 -07:00
Bill Yi
272619ebfc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I92ca6c87d1e88a3c3306934df34891cc0af31813
2022-08-06 23:53:07 -07:00
Bill Yi
ff8249a4cd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0
-s ours am: 19ea488dcc
-s ours am: 541b8bc18e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526354
Change-Id: I86345f9a78db3c5525a681f904c805d3b72f607f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:33:56 +00:00
Bill Yi
541b8bc18e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0
-s ours am: 19ea488dcc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526354
Change-Id: I63318ef3ceac148987969100763bcc5fc5f8bc69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:25:16 +00:00
TreeHugger Robot
92b422dce0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 48224eca28
-s ours am: 3dd47490aa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526350
Change-Id: Ib13206a8dda10b6ec3442469136cee94b0e0b01d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:24:53 +00:00
Bill Yi
dfdd2f8642
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 444ead6a2e
-s ours am: f4ef7ae208
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526350
Change-Id: Id20eabcdf46c16403beb0b9ecc3f1189b0dc2fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:24:52 +00:00
Bill Yi
e5c3bd9115
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72fe892fc6
-s ours am: 970d5d8599
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526258
Change-Id: I4a376848fff3da91d49846cab04686a777b3a5b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:24:49 +00:00
Bill Yi
19ea488dcc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526354
Change-Id: Ice25aff9ab1beaab4a272623928f706427c58186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:18:21 +00:00
TreeHugger Robot
3dd47490aa
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 48224eca28
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526350
Change-Id: Id992f50ac08314134d45bf996013efe8e7a60183
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:16:07 +00:00
Bill Yi
f4ef7ae208
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 444ead6a2e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526350
Change-Id: I50f0752de0308825aa5a7d0ff26975e6c7a9295b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:16:05 +00:00
Bill Yi
970d5d8599
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72fe892fc6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526258
Change-Id: I2509bd97be9fe12bb55f11f662c746bee61f00fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:16:03 +00:00