Bill Yi
d363db4937
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 437972564f
am: aa9489179b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: I1c46c47b52f71c63cf6344d2cc2b3210e6c46d7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:52:05 +00:00
Treehugger Robot
aae4f655d4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f4ca8c6033
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974870
Change-Id: Ie6dfae854dee478fd3b972a205fd577ea812111b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:51:17 +00:00
Treehugger Robot
48f8eecbd1
Merge changes from topic "tc_change_23050307_28" into udc-dev am: 954afa9586
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: Icd9d889138000530c5c65b80fcc14ebe5ccc6e34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:51:13 +00:00
Bill Yi
20a33c9bdd
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 437972564f
am: aa9489179b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: I6a9899e46f5a1aaf40b3d370489f840717a0b20b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:51:08 +00:00
Bill Yi
1e1ad8a6db
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c7368b683
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974870
Change-Id: I13ba538dde1973fad3cadc157e627487d301a407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:51:03 +00:00
Treehugger Robot
79c090dd85
Merge changes from topic "tc_change_23050307_28" into udc-dev am: 954afa9586
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: I1af2ab2bf8673b338b10542099519c98ac6cc777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:50:06 +00:00
Treehugger Robot
8cf712a373
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 30fe673ac9
-s ours am: 71f2e23696
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22975077
Change-Id: Ie904361f2a026e4070be299785b5ce939c0d486e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:50:03 +00:00
Bill Yi
2658b9338f
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 437972564f
am: aa9489179b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: Ie2e88d5a7767dcfbb631795bab3bd667cf6df57b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:49:59 +00:00
Bill Yi
7bfa543a7d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6096cceb3c
-s ours am: c2df5abd3c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22975077
Change-Id: If462b3f4da52301a234cfe6f5412473be3769732
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:49:53 +00:00
Treehugger Robot
d25d75be91
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f4ca8c6033
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974870
Change-Id: Icb1b76e223533802998bd976b5e45f0f67801d6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:49:24 +00:00
Bill Yi
afc79889f6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c7368b683
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974870
Change-Id: I1c66afa2a7b26c9030123e6787947c569ea91bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:49:21 +00:00
Treehugger Robot
532a6a82ea
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: fa11502d2f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22976158
Change-Id: I59975e94493f262e58000a20595adb6b8ba3249f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:48:37 +00:00
Treehugger Robot
f84817da57
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f4ca8c6033
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974870
Change-Id: I028f01235fb9987619c52e11b5579aaae20f708c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:48:33 +00:00
Bill Yi
295c824525
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e72e95fe98
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22976158
Change-Id: Ide8707255cca79378c30c10aebe5877150f7516f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:48:20 +00:00
Bill Yi
cf281ffe95
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c7368b683
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974870
Change-Id: Ia1f7a76768949b396f244eec1b574bac7b0837c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:48:17 +00:00
Bill Yi
8b08d034f0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e23f6ea87c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964412
Change-Id: Icd9523da2593ab59557125aa5c996230e2589030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:46:45 +00:00
TreeHugger Robot
78390226fc
Merge changes from topic "tc_change_23050307_27" into udc-dev am: 0848931c62
am: 61f1af73e6
am: b29f1fd82c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410
Change-Id: Ia2357a7e6c7b63d445684f5ec69baafeb22d1b59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:46:39 +00:00
Bill Yi
664b520cd8
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe
am: 7951afa544
-s ours am: 44d28ab6f5
-s ours am: 942a0adeb4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410
Change-Id: I5b7a0e1d502e4a719742edb3f81fec4f60d0a6cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:46:25 +00:00
Treehugger Robot
5a4e475544
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: d2605f6f6a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22976162
Change-Id: Iaa8b9e63d1eb4f409c347d37a34003455bec82ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:40:24 +00:00
Bill Yi
a610cb95e9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 099996c255
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22976162
Change-Id: I6cb0de85d4fe7d6032f32faea7f5c4e5e338139e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:40:13 +00:00
TreeHugger Robot
253cad32fd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: b5773f95c7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22976156
Change-Id: Idb561c55d9fd8f246e8b06bd9b5170a513d98190
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:36:31 +00:00
TreeHugger Robot
eece14a6a3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6759c1f3bc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22975961
Change-Id: Ida4a4e661e02dd3cd57c656d5e0dd5b4f4e4f723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:36:31 +00:00
Bill Yi
77442011d4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d0ccf90c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22975961
Change-Id: I5f298ba0f0790ad6035348b09a514f69a35fbaa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:36:28 +00:00
TreeHugger Robot
f936295a2a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5b29767921
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22975798
Change-Id: Iaa5c80b2d4186983870f8f04267e9527c6594f87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:36:24 +00:00
Bill Yi
af79004271
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fd75f93c7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22976156
Change-Id: I10416ce680a5abcc925ea102b1bc6a6bb202d63b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:36:22 +00:00
Bill Yi
a4e860e19e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1e2f1374d0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22975798
Change-Id: Ibd314154ce63d59bf2a85b73b3f2d9338478faff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:35:57 +00:00
TreeHugger Robot
379737f0be
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: b4d72181f8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22970727
Change-Id: Ia08314e1ffd685b809342b4681e2ab955eaa70a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:35:38 +00:00
Bill Yi
45f180037e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c206bd1217
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22970727
Change-Id: Ib7dcb635d14aba7eef556ed54d4dc4ff34dc6fc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:35:22 +00:00
Treehugger Robot
6fdd87169a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 30fe673ac9
-s ours am: f9e3b286f3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22975077
Change-Id: Ie63bbb16643d367219f281eaadbf9694ecc08700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:32:35 +00:00
Bill Yi
d526068047
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6096cceb3c
-s ours am: 77e56766c3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22975077
Change-Id: I6f948a884f240f7080d58ef02b173c925705a589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:32:21 +00:00
Treehugger Robot
1c79500a0d
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-03 21:31:19 +00:00
Treehugger Robot
7b5293a704
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-05-03 21:31:16 +00:00
Treehugger Robot
954afa9586
Merge changes from topic "tc_change_23050307_28" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 437972564f
Import translations. DO NOT MERGE ANYWHERE
2023-05-03 21:31:16 +00:00
TreeHugger Robot
6759c1f3bc
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-03 21:29:38 +00:00
TreeHugger Robot
5b29767921
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-03 21:29:38 +00:00
TreeHugger Robot
b4d72181f8
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-03 21:29:38 +00:00
Treehugger Robot
fa11502d2f
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-05-03 21:28:41 +00:00
Treehugger Robot
f4ca8c6033
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-03 21:27:41 +00:00
Treehugger Robot
cf29e7c9d7
Merge changes from topic "tc_change_23050307_54" into udc-dev-plus-aosp am: 03d406e123
am: 99cd07508a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964412
Change-Id: Id5bcb6db1b55f4e00d50ee06ce4a8c9d46aa7993
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:27:31 +00:00
Bill Yi
b48860772d
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e23f6ea87c
2p: e28505b1f9
am: e6d51e5378
-s ours am: 991f9a595e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964412
Change-Id: I4e173bb17d0a586c625b76544aeb0bb82ac3bc93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:27:23 +00:00
Treehugger Robot
fa5e90216c
Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae
am: 0624c88484
am: 64c4207014
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400
Change-Id: I6af1a78009b4db65f74d231696e19490cbfd6d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:27:10 +00:00
Treehugger Robot
50460b3467
Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae
am: c3d6820ffd
am: 80bbca1866
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400
Change-Id: I441e496da3d6d35aaf4b9a87a8248a1d02c09f8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:24:28 +00:00
Treehugger Robot
a7b0497073
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 30fe673ac9
-s ours am: 087bc6aae1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22975077
Change-Id: I2c3919f0daa49cf76b5a67ff9c2ffc61d3363c01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:22:23 +00:00
Bill Yi
e4dd357109
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6096cceb3c
-s ours am: eb73e3db2d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22975077
Change-Id: I75acbb9010e5366648d9a9bfcd79aa4b848b97da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:22:11 +00:00
TreeHugger Robot
b29f1fd82c
Merge changes from topic "tc_change_23050307_27" into udc-dev am: 0848931c62
am: 61f1af73e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410
Change-Id: I90a36956026d42552454b36af82e158e95a15d50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:13:12 +00:00
Bill Yi
942a0adeb4
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe
am: 7951afa544
-s ours am: 44d28ab6f5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410
Change-Id: I7cda298241e80dc39c41eeae740fe6f2bf22dba0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:13:03 +00:00
David Liu
6ff8643e82
Add Tapjacking Protection for all screens extends StorageWizardBase in Settings.
...
Add/remove the SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS flag into/from all screens extends StorageWizardBase with lifecycle.
Bug: 255305175
Test: manual test with make RunSettingsRoboTests
Change-Id: I7ed9e2bf9bbebf6cd6b7e76ad47a6d4155eb2eb2
2023-05-03 21:11:35 +00:00
TreeHugger Robot
5062c59bc0
Merge changes from topic "tc_change_23050307_27" into udc-dev am: 0848931c62
am: 178d880667
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410
Change-Id: I3e31f47c268e70f39e905f8a1e33d8c26510b85e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:07:09 +00:00
Bill Yi
fd5b639bbc
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe
am: 7951afa544
-s ours am: cdfa21f8d7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410
Change-Id: Icbd7c5b5810f7d736da07c7ea8799b9b4a5e82d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:06:56 +00:00
Treehugger Robot
f9e3b286f3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 30fe673ac9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22975077
Change-Id: Iebcec0e41e7766276b907b4ece881e319c049c45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:06:49 +00:00