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
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
2588b9dfaf
Merge changes from topic "tc_change_23050307_27" into udc-dev am: 0848931c62 am: aa8a040424
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964410
Change-Id: Iecd22bac79b94ff0193d2361f34496705dcbef29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:06:23 +00:00
Bill Yi
9a4e7ce0ca
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a68ce93fbe am: 7951afa544 -s ours am: 301f60a2d2 -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: Ib3ac00cceefaa974c6c6eb4a0a3d2f19432438f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:06:13 +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
087bc6aae1
[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: Iad94247084170625d4a3f63614da8a5affcb1c0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:05:16 +00:00
Treehugger Robot
abb4f4a4c5
Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae am: c3d6820ffd am: 00efff2f18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400
Change-Id: I5eff98d026d275c1cc3e519f9d943f77d0d3b520
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:05:08 +00:00
Bill Yi
eb73e3db2d
[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: Ib0c4fe784fe274b9ce9f7f31cd86b09a3c40da18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 21:05:01 +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
d2605f6f6a
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-05-03 21:01:27 +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
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
aa8a040424
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: I4769684c969f0aaab4fa577a45b5e136343c566f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 20:54:18 +00:00
Bill Yi
301f60a2d2
[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: Ifeed0de4817c78c8b47f98f0f7d9e60874e51c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 20:54:04 +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
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
8ec94497d9
Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae am: 69dcb19d2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400
Change-Id: I6a6847b98fa774efc3d3977d50512e446beb38c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 20:22:16 +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
69dcb19d2d
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: I66b056b1e770fba5324eb7f828d253b1b71efd63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 19:37:50 +00: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
David Gutierrez
88324206cd
Merge "Revert "Disable Settings large-screen optimization"" into udc-dev am: 570943637c am: 6a8a9492d7 am: 19da9aeb52 am: 12006ec17f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22993391
Change-Id: I7218c56ee517e480ac9d0d1ac7a71675d243b415
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 18:59:27 +00:00
Becca Hughes
bf24b2c7f3
Merge "Align settings with new mocks" into udc-dev am: 21733fa106 am: 454cfbf2cc am: b20744c9fc am: 5d5e0c4c08
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923
Change-Id: Idf047f3080adea27c935e321232612c6776c8fe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 18:53:34 +00:00
David Gutierrez
bc37566221
Merge "Revert "Disable Settings large-screen optimization"" into udc-dev am: 570943637c am: 6a8a9492d7 am: 0e71133580 am: d180bb6337
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22993391
Change-Id: Ic06bdb94ed9aea34576c1585d9536ab12357932d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 18:50:08 +00:00
Becca Hughes
5cfab44d87
Merge "Align settings with new mocks" into udc-dev am: 21733fa106 am: 454cfbf2cc am: f34efc3da2 am: e863948acd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923
Change-Id: Ie574bd51806661620a888ee2b5b559594c072a76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 18:47:53 +00:00
David Gutierrez
743bd2297f
Merge "Revert "Disable Settings large-screen optimization"" into udc-dev am: 570943637c am: e156e0d96c am: 5cabf788b8 am: fb2b66075d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22993391
Change-Id: Ic0bb0d7ffaeeaf99032dbf992af6b103db3dd2ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 18:47:25 +00:00
Becca Hughes
534a06ce8d
Merge "Align settings with new mocks" into udc-dev am: 21733fa106 am: 6f600f1ddf am: 4326242066 am: 027c7213ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923
Change-Id: Id51fc284b60734f0e0cb338374a93ae63c3fd8f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 18:46:07 +00:00
Eric Biggers
1ccf11d582
Merge "ShadowLockPatternUtils: remove patternEverChosen methods"
2023-05-03 18:28:39 +00:00
David Gutierrez
12006ec17f
Merge "Revert "Disable Settings large-screen optimization"" into udc-dev am: 570943637c am: 6a8a9492d7 am: 19da9aeb52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22993391
Change-Id: I73933a7cda80480a62da64a4fd6d77f2f39b544b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 18:27:31 +00:00
Becca Hughes
5d5e0c4c08
Merge "Align settings with new mocks" into udc-dev am: 21733fa106 am: 454cfbf2cc am: b20744c9fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923
Change-Id: Ia5e0c20e3446bc9956ee525d1cbe81a797fa33fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 18:26:32 +00:00
David Gutierrez
d180bb6337
Merge "Revert "Disable Settings large-screen optimization"" into udc-dev am: 570943637c am: 6a8a9492d7 am: 0e71133580
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22993391
Change-Id: Ifb9db16c970d2df07c642d7d720028e5fb203865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 18:04:18 +00:00
Becca Hughes
e863948acd
Merge "Align settings with new mocks" into udc-dev am: 21733fa106 am: 454cfbf2cc am: f34efc3da2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923
Change-Id: If1a4c7709f6e1f3df24983e642643a1a69ac0a2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 18:02:53 +00:00
David Gutierrez
fb2b66075d
Merge "Revert "Disable Settings large-screen optimization"" into udc-dev am: 570943637c am: e156e0d96c am: 5cabf788b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22993391
Change-Id: Ifb9ca30b1fff360fe87ac78d0301c8b449eaab11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 18:02:08 +00:00
Becca Hughes
027c7213ab
Merge "Align settings with new mocks" into udc-dev am: 21733fa106 am: 6f600f1ddf am: 4326242066
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923
Change-Id: Ia03bc602567d208bec44d619882684a71077b6bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 18:00:29 +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