TreeHugger Robot
b3e3a33a3e
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972
am: e6e739d8b0
am: ed29b05dcd
am: 0b507f0203
-s ours am: 7bd23716c3
-s ours am: 8eacc8a8dc
-s ours am: 6d9631779d
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I45a103b233c117cd88564ff7c7dc594d446e6cec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 19:02:55 +00:00
TreeHugger Robot
3f74c5175f
Merge "Warnings at top of per-app settings page" into tm-dev am: 52ea95aa55
am: bb5466b1f8
am: 1c36a9ff0c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17518134
Change-Id: I6ffa79aa553c49b4cceacf60c37071e865746d56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 18:55:45 +00:00
TreeHugger Robot
6d9631779d
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972
am: e6e739d8b0
am: ed29b05dcd
am: 0b507f0203
-s ours am: 7bd23716c3
-s ours am: 8eacc8a8dc
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I19f3ca5069da1b3bcce1e50583b06f5f6e0d2fa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 18:41:57 +00:00
TreeHugger Robot
d3fdbf5def
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972
am: e6e739d8b0
am: ed29b05dcd
am: 0b507f0203
-s ours am: 7bd23716c3
-s ours am: b41a74c1a9
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I171f729159e3093bb8d317feaab681c889fc0db3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 18:41:55 +00:00
TreeHugger Robot
1c36a9ff0c
Merge "Warnings at top of per-app settings page" into tm-dev am: 52ea95aa55
am: bb5466b1f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17518134
Change-Id: I0fb81a009d71d312f7707fafbd625678d5e5f2ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 18:28:50 +00:00
TreeHugger Robot
8eacc8a8dc
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972
am: e6e739d8b0
am: ed29b05dcd
am: 0b507f0203
-s ours am: 7bd23716c3
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I8a0e31ec51c4a133b2f4842d47f818461f9e712b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 18:27:04 +00:00
TreeHugger Robot
b41a74c1a9
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972
am: e6e739d8b0
am: ed29b05dcd
am: 0b507f0203
-s ours am: 7bd23716c3
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I6b0a4bc63732cb838bac6d6d16625ca44f6ba4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 18:26:08 +00:00
TreeHugger Robot
542d772b1b
Merge "Warnings at top of per-app settings page" into tm-dev am: 52ea95aa55
am: 2571882ab4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17518134
Change-Id: I5e6bce9dd2f4a2d18fd3916636293b8173f7da54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 18:12:07 +00:00
TreeHugger Robot
7bd23716c3
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972
am: e6e739d8b0
am: ed29b05dcd
am: 0b507f0203
-s ours
...
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I3f91cd3600b1b581beac0b262a35cbf66fed209e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 18:03:28 +00:00
TreeHugger Robot
bb5466b1f8
Merge "Warnings at top of per-app settings page" into tm-dev am: 52ea95aa55
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17518134
Change-Id: Ib9c9b6702b9d7f541debd2b9f0677590d8e3149f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 17:57:10 +00:00
TreeHugger Robot
2571882ab4
Merge "Warnings at top of per-app settings page" into tm-dev am: 52ea95aa55
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17518134
Change-Id: I1afbf8fba06b5a77e7e68a81b70c75313f808376
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 17:56:22 +00:00
TreeHugger Robot
0b507f0203
[conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972
am: e6e739d8b0
am: ed29b05dcd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383
Change-Id: I03622a4803112de1f7b2f2fb3000b007444bc19b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 17:48:29 +00:00
TreeHugger Robot
52ea95aa55
Merge "Warnings at top of per-app settings page" into tm-dev
2022-04-01 17:40:09 +00:00
PETER LIANG
623ab4ace2
Merge "Update the preview of the conversation message in the "Display size and text" page." into tm-dev am: 93d4886297
am: 26ec8e895b
am: 122288f922
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17400625
Change-Id: I3beb0b3b18cb189fc34ccc9f00910dd135ddd23b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 17:05:12 +00:00
PETER LIANG
122288f922
Merge "Update the preview of the conversation message in the "Display size and text" page." into tm-dev am: 93d4886297
am: 26ec8e895b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17400625
Change-Id: I660f3509825d04934c1a61418a9f860c2c97e2d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 16:44:26 +00:00
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
26ec8e895b
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: Id85adfbb740b5214310762c8e1d185f3d0130c44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 16:22:30 +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
TreeHugger Robot
ed29b05dcd
[conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972
am: e6e739d8b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17003629
Change-Id: I8bba0ed0611a7cef34b210e7e7553de70dbf9aa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2022-04-01 16:13:50 +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
danielwbhuang
baa59815d8
Warnings at top of per-app settings page
...
1. Check getInstallPackageName() and isSystemApp()
2. Link to play store
Bug: 221164159
Test: local
Change-Id: I5727a4b99d945ae5c1b517020026654796a34d98
2022-04-01 23:41:56 +08: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
e6e739d8b0
Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17003629
Change-Id: I5ebae8947d883130b93c9a82d087656dab41498a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-01 12:58:31 +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
74ff164972
Merge "Prevent exfiltration of system files via user image settings." into qt-dev
2022-04-01 12:42:31 +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