Bill Yi
b4ab4fd7f6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 86c5b0816b
-s ours am: 56cb3df78d
-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: I81db371b50cc2f85cfd6bf22b8ae077c933dd8bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:13:53 +00:00
Treehugger Robot
9147bf15e7
Merge changes from topic "tc_change_23050307_28" into udc-dev am: 954afa9586
am: 79c090dd85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411
Change-Id: I4c2d7a67015ec5b9fa7f931eb5c908e3d15274e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:12:30 +00:00
Bill Yi
c4204c0ef5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e23f6ea87c
-s ours am: 8b08d034f0
-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: Ia545578de8ee5ec1147a7c47d0f07c51eedc0fac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:12:29 +00:00
Bill Yi
c8076ba7b3
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 437972564f
am: aa9489179b
-s ours am: 2658b9338f
-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: I70f5045f3048b5d8a1b2afc0a0f6350126c49d28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:12:25 +00:00
Treehugger Robot
20bbc6456c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f4ca8c6033
-s ours am: d25d75be91
-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: I4d2a2cf0e1a19d307ce8819c64da7021e802c62e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:12:06 +00:00
Bill Yi
8cef29d5c4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c7368b683
-s ours am: afc79889f6
-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: I1e1ce4d3fd6b731aa9965986713ddbbedd78f856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:12:03 +00:00
Treehugger Robot
4195ac4a28
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1c79500a0d
-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: I1dbc044b56e00fa91ae7bc49b59935d965d3ec08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 22:11:59 +00:00
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
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
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
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
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
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
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
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
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
d2605f6f6a
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-05-03 21:01:27 +00:00
TreeHugger Robot
b5773f95c7
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-05-03 20:57:21 +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
00efff2f18
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: I6e2b48adfd124bd1d7aa67cc975fb6dc2e4d3350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 20:23:29 +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
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
David Gutierrez
19da9aeb52
Merge "Revert "Disable Settings large-screen optimization"" into udc-dev am: 570943637c
am: 6a8a9492d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22993391
Change-Id: Ie27314bb320132fe579c48099fa34f4508c77ccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 17:41:55 +00:00
Becca Hughes
b20744c9fc
Merge "Align settings with new mocks" into udc-dev am: 21733fa106
am: 454cfbf2cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923
Change-Id: I535bbe38e6ac91ed1c635c5ac8d8a399d4f701ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 17:41:11 +00:00
Patty Huang
f05615f1e8
Add toggle to show/hide the Per Device Enable LE Audio Toggle in Device details
...
Bug: 280020008
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioDeviceDetailsPreferenceControllerTest
Change-Id: I559f34f2b0764c4f566fe1e0c1357929e2c88fb6
2023-05-04 01:26:15 +08:00
David Gutierrez
6a8a9492d7
Merge "Revert "Disable Settings large-screen optimization"" into udc-dev am: 570943637c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22993391
Change-Id: I71a855eb9c082e8c32d6a56c07722c08984b019e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 16:37:22 +00:00
Becca Hughes
454cfbf2cc
Merge "Align settings with new mocks" into udc-dev am: 21733fa106
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923
Change-Id: I2a423b8a0a96ebcc51f04f0603e73e4f2fd24bc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 16:36:56 +00:00