Bill Yi
56cb3df78d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 86c5b0816b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974865
Change-Id: I70725f091a2da02f8303c8fa1e3af0da89156959
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:11:52 +00:00
Treehugger Robot
08d728c8f4
[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: Iaabdc724fd870d1ef534341f6202c3ee14613ea8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:10:45 +00:00
Bill Yi
81a9f0e818
[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: If1e440da35662ee478986132c9faeb0af2be4bfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:10:30 +00:00
TreeHugger Robot
9cdbbc334e
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: Ic0feb73e2eebe7c969f52f840e3cbff529d2bc2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:08:23 +00:00
Bill Yi
cc1284d1e2
[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: Ic283d13723856eca6124e0475ade96e510893a90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:08:11 +00:00
Treehugger Robot
089c61b6ae
Merge changes from topic "tc_change_23050307_28" into udc-dev am: 954afa9586
am: 48f8eecbd1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: I9cdfd1b47fc1e66d2dc81269d9899a3c4644da22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:54:48 +00:00
Bill Yi
ca3c627645
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 437972564f
am: aa9489179b
-s ours am: 20a33c9bdd
-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: I815de59511f8af129d5a0b8d60ed695f6b3350ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:54:43 +00:00
Treehugger Robot
989436c29a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f4ca8c6033
-s ours am: f84817da57
-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: I34f269b31044407c36fb31b8279dced66a6b3473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:52:21 +00:00
Bill Yi
c8907529e0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c7368b683
-s ours am: cf281ffe95
-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: If8e492b95af731536c0515b56c1d77dd4c04b393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:52:19 +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
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
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
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
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
f4ca8c6033
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-03 21:27:41 +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
Bill Yi
77e56766c3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6096cceb3c
-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: I583569809810380cb5a34088d216e84f001b41ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:06:37 +00:00
Treehugger Robot
71f2e23696
[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: Idee576985392329e29e4c01129da49d5b476723b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:06:05 +00:00
Treehugger Robot
99cd07508a
Merge changes from topic "tc_change_23050307_54" into udc-dev-plus-aosp am: 03d406e123
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964412
Change-Id: I646c43075c127946be2f2f4455661e9647da7244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:05:58 +00:00
Bill Yi
991f9a595e
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e23f6ea87c
2p: e28505b1f9
am: e6d51e5378
-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: I3325ebde21ea4838ba481d9388aaef56845827d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:05:56 +00:00
Bill Yi
c2df5abd3c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6096cceb3c
-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: Iff4d8a8b9430238b395bb39ce30b3d55a5b4e169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:05:51 +00:00
TreeHugger Robot
178d880667
Merge changes from topic "tc_change_23050307_27" into udc-dev am: 0848931c62
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410
Change-Id: I0405b07dcd7cd97a732f5297bc540b2f92ecb3b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:03:58 +00:00
Bill Yi
cdfa21f8d7
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe
am: 7951afa544
-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: I7bc53c5b42619d6942daa8823d0b902d6c14084b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:03:53 +00:00
Treehugger Robot
03d406e123
Merge changes from topic "tc_change_23050307_54" into udc-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e23f6ea87c
2p: e28505b1f9
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e23f6ea87c
Import translations. DO NOT MERGE ANYWHERE
2023-05-03 20:59:02 +00:00
Treehugger Robot
30fe673ac9
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-03 20:55:59 +00:00
TreeHugger Robot
61f1af73e6
Merge changes from topic "tc_change_23050307_27" into udc-dev am: 0848931c62
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410
Change-Id: Ic8d79dfaa411f3293f1a2905d834f731a69711ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 20:51:39 +00:00
Bill Yi
44d28ab6f5
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe
am: 7951afa544
-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: I3f702284b57f224f55eb10f49cbabdd030f92aaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 20:51:24 +00:00
TreeHugger Robot
0848931c62
Merge changes from topic "tc_change_23050307_27" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe
Import translations. DO NOT MERGE ANYWHERE
2023-05-03 20:46:29 +00:00
Treehugger Robot
64c4207014
Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae
am: 0624c88484
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400
Change-Id: Ib4875f5d114621989b4f40d18d2a94af7662bc3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 20:22:32 +00:00
Treehugger Robot
80bbca1866
Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae
am: c3d6820ffd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400
Change-Id: Iae2aec7301d3c73b86b84638b0c0993a79168b1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 20:20:21 +00:00
SongFerngWang
706257c57a
Hide the LE audio toggle by flag
...
Bug: 280021500
Test: build pass.
Change-Id: I3f4a821c50dfb9d2de73919945334b42c59b3309
2023-05-04 03:43:28 +08:00
Treehugger Robot
0624c88484
Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400
Change-Id: If3d83edcabc4249b963666b8d1d83a2eab0e45e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 19:37:39 +00:00
Derek Jedral
5a75cd54d4
Change preference title if Active Unlock enabled
...
Change the title of the preference to reflect that Active Unlock can
also be used to unlock the device.
Test: make RunSettingsRoboTests
Bug: b/271782800
Change-Id: Ie227e6dddfc024235fc3568899ef151f14f17696
2023-05-03 12:37:01 -07:00
Treehugger Robot
c3d6820ffd
Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400
Change-Id: Id1f507633ad33b5b0719dba4bc507e73ce7832e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 19:36:46 +00:00
Treehugger Robot
7244f3a0ae
Merge "Update auto_rotate_summary string for different product" into udc-dev
2023-05-03 19:09:07 +00:00