Commit Graph

102580 Commits

Author SHA1 Message Date
PETER LIANG
05da36b217 Merge "Update the preview of the conversation message in the "Display size and text" page." into tm-dev am: 93d4886297 am: e9d9fe62ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17400625

Change-Id: Ia7656b566a7930fc132a49d06d0d2f47289c53f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 16:44:01 +00:00
PETER LIANG
e9d9fe62ad Merge "Update the preview of the conversation message in the "Display size and text" page." into tm-dev am: 93d4886297
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17400625

Change-Id: Ie428f63f65b4292703a2ff1c00e9a1ea637775d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 16:21:33 +00:00
PETER LIANG
93d4886297 Merge "Update the preview of the conversation message in the "Display size and text" page." into tm-dev 2022-04-01 16:03:10 +00:00
Xinyi Zhou
0bdce691c3 Merge "Turn off Fast Pair MainSwitch" into tm-dev am: a809f491e5 am: bc54b145ab am: fdd93998e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17532006

Change-Id: I5666e4a7e75e29fed631bac8505effb21c012058
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 16:02:11 +00:00
Xinyi Zhou
fdd93998e4 Merge "Turn off Fast Pair MainSwitch" into tm-dev am: a809f491e5 am: bc54b145ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17532006

Change-Id: I165888d533c67317b8312450945294fc60dc8745
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 15:42:49 +00:00
Xinyi Zhou
1fb5ca07b0 Merge "Turn off Fast Pair MainSwitch" into tm-dev am: a809f491e5 am: 8020b80e8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17532006

Change-Id: Ib6f89dc61057cbdedaff662afcffef72ad597e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 15:41:42 +00:00
Xinyi Zhou
bc54b145ab Merge "Turn off Fast Pair MainSwitch" into tm-dev am: a809f491e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17532006

Change-Id: I8d3fc050c99a97944418d69ec184b4eb33a12da9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 15:26:51 +00:00
Xinyi Zhou
8020b80e8c Merge "Turn off Fast Pair MainSwitch" into tm-dev am: a809f491e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17532006

Change-Id: I40e33d7330595fee1b6c0b2d8c0e485531aa2db0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 15:25:58 +00:00
Xinyi Zhou
a809f491e5 Merge "Turn off Fast Pair MainSwitch" into tm-dev 2022-04-01 15:13:09 +00:00
TreeHugger Robot
9a9fb0ded5 Merge "[Panlingual] Add error message on per-app language page." into tm-dev am: ba1f3dc8df am: 2500cd25c7 am: 2c89380222
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17536306

Change-Id: I165b598678c66a9c7cb59c209b8fb0a893ade006
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 13:05:20 +00:00
TreeHugger Robot
2c89380222 Merge "[Panlingual] Add error message on per-app language page." into tm-dev am: ba1f3dc8df am: 2500cd25c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17536306

Change-Id: I8294ce39eeb6d4b3ae917d1fbf6171b1a563376c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 12:44:14 +00:00
TreeHugger Robot
7498736a41 Merge "[Panlingual] Add error message on per-app language page." into tm-dev am: ba1f3dc8df am: daff8fb3ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17536306

Change-Id: Ie22b021c3787aba977d3b62a3691f0c89f7dc518
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 12:43:52 +00:00
TreeHugger Robot
2500cd25c7 Merge "[Panlingual] Add error message on per-app language page." into tm-dev am: ba1f3dc8df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17536306

Change-Id: Ic4041ad3e187031151850612acfae2738fbc02bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 12:22:54 +00:00
TreeHugger Robot
daff8fb3ec Merge "[Panlingual] Add error message on per-app language page." into tm-dev am: ba1f3dc8df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17536306

Change-Id: I1e8771fc075bc871c67024e4f48e76af30cc88ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 12:22:12 +00:00
TreeHugger Robot
ba1f3dc8df Merge "[Panlingual] Add error message on per-app language page." into tm-dev 2022-04-01 12:04:17 +00:00
Peter_Liang
454f21cb21 Update the preview of the conversation message in the "Display size and text" page.
Bug: 227076211
Test: manual test
Change-Id: Ie83f95ba223a42f596c2a4ef68f33f4152a2cc07
2022-04-01 18:09:28 +08:00
TreeHugger Robot
93b513858b Merge "Fine tune background color for dual pane in homepage" into tm-dev am: 046d174a55 am: dfd1c2043e am: c3abe5f6dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17465487

Change-Id: Ia7f7754b08886338091d54ae7e4647c9d528f1f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 10:02:34 +00:00
TreeHugger Robot
cad40d3b6f Merge "Fine tune Select time zone Settings UI" into tm-dev am: 91be4fbe35 am: e4ae02c6ae am: 3a536a026a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17526344

Change-Id: Iabe8f1d2cfee3a15aa22a1764bd7b34a72c3556e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 10:02:27 +00:00
Weng Su
a6fbf32e26 Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6 am: ec1b6c308a am: c422d95147 am: 9ed56d081c am: 32ebc2afd9 am: ce7f56de67
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236

Change-Id: I6d5fa9e521b164049a5c42ba0c502b232e1ca7cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 10:02:04 +00:00
TreeHugger Robot
c3abe5f6dd Merge "Fine tune background color for dual pane in homepage" into tm-dev am: 046d174a55 am: dfd1c2043e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17465487

Change-Id: Ia18795a157919fa9818e64e079f59a00f641aac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 09:48:46 +00:00
TreeHugger Robot
bdfb7f8ddf Merge "Fine tune background color for dual pane in homepage" into tm-dev am: 046d174a55 am: 261dd1c821
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17465487

Change-Id: I5ad8ae648819be5de47a38f66d67377bd67cd83a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 09:48:41 +00:00
TreeHugger Robot
3a536a026a Merge "Fine tune Select time zone Settings UI" into tm-dev am: 91be4fbe35 am: e4ae02c6ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17526344

Change-Id: I429d8a3298a3e50dff689149642b497d89195712
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 09:48:40 +00:00
Weng Su
ce7f56de67 Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6 am: ec1b6c308a am: c422d95147 am: 9ed56d081c am: 32ebc2afd9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236

Change-Id: I334f0b4f6bf281fd50492945c1f26c9f963b01ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 09:48:35 +00:00
TreeHugger Robot
0fe4947dd5 Merge "Fine tune Select time zone Settings UI" into tm-dev am: 91be4fbe35 am: fb280af676
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17526344

Change-Id: I4861d8eebb61924648b11f35ff0174c3edb857de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 09:48:33 +00:00
Weng Su
2f87645c47 Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6 am: ec1b6c308a am: c422d95147 am: 9ed56d081c am: 057c17fec8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236

Change-Id: I364fb8f0a45839ce8a7b14dee7de0c2b120eca95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 09:48:05 +00:00
TreeHugger Robot
dfd1c2043e Merge "Fine tune background color for dual pane in homepage" into tm-dev am: 046d174a55
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17465487

Change-Id: I07943c63bc8631c150d53361f76788f9b99eef1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 09:41:56 +00:00
TreeHugger Robot
261dd1c821 Merge "Fine tune background color for dual pane in homepage" into tm-dev am: 046d174a55
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17465487

Change-Id: I71d49c46b98b545ff2d0af9ca39c686da1c643d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 09:41:00 +00:00
TreeHugger Robot
046d174a55 Merge "Fine tune background color for dual pane in homepage" into tm-dev 2022-04-01 09:34:07 +00:00
TreeHugger Robot
e4ae02c6ae Merge "Fine tune Select time zone Settings UI" into tm-dev am: 91be4fbe35
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17526344

Change-Id: I60fd5cd005e6206778cca368f4d4b25fb6b25448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 09:29:02 +00:00
TreeHugger Robot
fb280af676 Merge "Fine tune Select time zone Settings UI" into tm-dev am: 91be4fbe35
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17526344

Change-Id: I6c6c9bb9e4b0dcd0fb527bbe2d963c7f4a17e3e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 09:28:45 +00:00
Weng Su
32ebc2afd9 Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6 am: ec1b6c308a am: c422d95147 am: 9ed56d081c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236

Change-Id: I4556ce153de8f8524bbb92b47ef9202689c0b1fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 09:28:29 +00:00
tom hsu
40a6de1ec4 [Panlingual] Add error message on per-app language page.
Bug: 226032712
Test: local
Change-Id: I12aae66116cc8c00fa7c6b0ba256d4726620ea4c
(cherry picked from commit a9184f43c5)
2022-04-01 09:28:01 +00:00
Weng Su
057c17fec8 Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6 am: ec1b6c308a am: c422d95147 am: 9ed56d081c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236

Change-Id: If6d2c0fa6b1b73eccc14678072907a9c2e055215
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 09:27:42 +00:00
Tom Hsu
aaac7dd777 Merge "[Panlingual] Add error message on per-app language page." 2022-04-01 09:20:10 +00:00
TreeHugger Robot
91be4fbe35 Merge "Fine tune Select time zone Settings UI" into tm-dev 2022-04-01 09:18:05 +00:00
Weng Su
9ed56d081c Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6 am: ec1b6c308a am: c422d95147
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236

Change-Id: I71a0799dd5561b069d587491f78957e48fa87541
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 09:06:51 +00:00
Weng Su
c422d95147 Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6 am: ec1b6c308a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236

Change-Id: I7ba4a451a493b9d4df278f7aee6bfbacc9bf2322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 08:47:33 +00:00
Tom Hsu
2fb36ce893 Merge "Fix System language option missing and locale region missing issue" into tm-dev am: 84f78bc493 am: 45dae0ff5d am: 710d01d4f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17526345

Change-Id: I19ad703e92681902484871ef4717923cbbefebcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 08:29:29 +00:00
Treehugger Robot
03181f299c Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c am: a1a5091f12 am: 3fb5213538 am: 973031b290 am: 537cf057b2 am: fb55419577
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445

Change-Id: If2d390c383fa4ea178f088617be47cb4e478c639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 08:29:21 +00:00
Josh Hou
12f7c6584a Merge "[Panlingual] Fix the app language is shown incorrectly in the work profile" into tm-dev am: 6ead6df534 am: 37164a1af7 am: 55a7e3e1f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17524431

Change-Id: Ibf6f9550b6870ac64aafbb5012406fb25a575c47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 08:29:11 +00:00
Weng Su
ec1b6c308a Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236

Change-Id: Ib5462706a20ca6565144faae9c5009939bf2eb08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 08:28:28 +00:00
Tom Hsu
710d01d4f6 Merge "Fix System language option missing and locale region missing issue" into tm-dev am: 84f78bc493 am: 45dae0ff5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17526345

Change-Id: Idfc90fb90b1f2fddecc2f36749194a56c7dea412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 08:16:44 +00:00
Treehugger Robot
fb55419577 Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c am: a1a5091f12 am: 3fb5213538 am: 973031b290 am: 537cf057b2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445

Change-Id: I5313b751631a80ed881a322c4b10cd3ec30a557c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 08:16:39 +00:00
Josh Hou
55a7e3e1f7 Merge "[Panlingual] Fix the app language is shown incorrectly in the work profile" into tm-dev am: 6ead6df534 am: 37164a1af7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17524431

Change-Id: Ie286a75243f08fc0cda47f7c292bfcb5ebc08387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 08:16:32 +00:00
Tom Hsu
0553dd13ac Merge "Fix System language option missing and locale region missing issue" into tm-dev am: 84f78bc493 am: 567fdcd782
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17526345

Change-Id: I2c477c71e8035af1591440320e964ac2aeaab8c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 08:16:24 +00:00
Treehugger Robot
8339d051b0 Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c am: a1a5091f12 am: 3fb5213538 am: 973031b290 am: babd81d61c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445

Change-Id: Ia9d800a7681ddb35741839eb224d290ab1a2bdee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 08:16:17 +00:00
Josh Hou
47ca0952d4 Merge "[Panlingual] Fix the app language is shown incorrectly in the work profile" into tm-dev am: 6ead6df534 am: 96f0d3cab9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17524431

Change-Id: I8ae7dda42061203a1dbeed366714ee5f88a4a4fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 08:16:07 +00:00
Weng Su
c68e241fa6 Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" 2022-04-01 08:08:51 +00:00
Tom Hsu
45dae0ff5d Merge "Fix System language option missing and locale region missing issue" into tm-dev am: 84f78bc493
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17526345

Change-Id: I8b0aa19bcb5bff35d30e43c493e106a511dc38f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 07:57:22 +00:00
Treehugger Robot
537cf057b2 Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c am: a1a5091f12 am: 3fb5213538 am: 973031b290
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445

Change-Id: I459260827839a534dfb749bd967e23fd70054c24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 07:57:15 +00:00