Commit Graph

125180 Commits

Author SHA1 Message Date
Treehugger Robot
a614ab28df Merge changes from topic "tc_change_23050307_28" into udc-dev am: 954afa9586 am: abd70c74dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22964411

Change-Id: I31fcecb799be571347c77d1b0838fdc907aa0326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 21:53:38 +00:00
Bill Yi
19195c749e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 437972564f am: aa9489179b -s ours am: d363db4937 -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: I9ad433b299caa26cf234f57c5e04bb6429776265
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 21:53:33 +00:00
Treehugger Robot
fa913e2d62 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f4ca8c6033 -s ours am: aae4f655d4 -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: I4702d936acc64ce6e6c839562682cdfdf15ffeb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 21:53:17 +00:00
Bill Yi
7567cb2226 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c7368b683 -s ours am: 1e1ad8a6db -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: I1267d723636a34005a8929ba57b72dd6247588d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 21:53:15 +00:00
Treehugger Robot
abd70c74dd 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: I8294a945e09535da34c11b15ec24b6a2eaa4c897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 21:52:10 +00:00
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
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
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
f4ca8c6033 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-03 21:27:41 +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
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
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
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
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
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
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
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
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
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
David Gutierrez
9f40a38b44 Merge "Revert "Disable Settings large-screen optimization"" into udc-dev am: 570943637c am: e5e72d1729
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22993391

Change-Id: I353b1d481bed1212c074b59d232641d3363a0b17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 17:37:29 +00:00
David Gutierrez
0e71133580 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: I685451f0d65e5e929f519c6eb0729c9d0257a99f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 17:37:10 +00:00
Becca Hughes
f34efc3da2 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: I0f7c5509de3ea5000ca77272c32bb2021992d616
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 17:36:16 +00:00
Becca Hughes
1c5bfbeafd Merge "Align settings with new mocks" into udc-dev am: 21733fa106 am: 1022918da5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923

Change-Id: Ica4092467ac4a290b5f1a5ec0f7c7905e3928755
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 17:36:09 +00:00
David Gutierrez
5cabf788b8 Merge "Revert "Disable Settings large-screen optimization"" into udc-dev am: 570943637c am: e156e0d96c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22993391

Change-Id: I90d7e3ca0ecaf5156620b7dd831d7f45e41967a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 17:21:04 +00:00
Becca Hughes
4326242066 Merge "Align settings with new mocks" into udc-dev am: 21733fa106 am: 6f600f1ddf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22912923

Change-Id: I0fdd0a74a86dcf7a80948bffa5024f53cdeaca47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 17:20:46 +00: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
David Gutierrez
e156e0d96c 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: If571038f3ffb62336ad97e16e7030b14446b2c43
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
David Gutierrez
e5e72d1729 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: Iefef809ceebb3c84cb311e4bfbdcf35a1c36b32e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 16:36:55 +00:00
Becca Hughes
6f600f1ddf 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: I563b006d6eccc442dd63a39bca10a8bd82eb690e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 16:36:54 +00:00
Becca Hughes
1022918da5 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: I0f2e492e45177a5ac7e2e76dc1957f74d73f9781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 16:36:26 +00:00