PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,827 Commits 1 Branch 0 Tags
f03640729812f883f86911a53d85dafdbbb6580c
Commit Graph

102827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
18bb0d8a59 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e75d9ee3e9 -s ours am: 35cf5330a9 -s ours am: 444e9d38f6 -s ours am: 524cba9409 -s ours 
am skip reason: Merged-In I50e3649c21bb83ee9130fa98a71560fe261198a9 with SHA-1 6ca8dd1b1a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17545189

Change-Id: I72af492a695d41c82f0aaec187512c54b6625ba0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 09:08:42 +00:00
Xin Li
033da0ca50 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e75d9ee3e9 -s ours am: 35cf5330a9 -s ours am: 444e9d38f6 -s ours am: 7f998a1b5b -s ours 
am skip reason: Merged-In I50e3649c21bb83ee9130fa98a71560fe261198a9 with SHA-1 6ca8dd1b1a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17545189

Change-Id: I032051d9ce433c30ac206428dfbd35363f10e8b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 09:00:28 +00:00
Xin Li
524cba9409 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e75d9ee3e9 -s ours am: 35cf5330a9 -s ours am: 444e9d38f6 -s ours 
am skip reason: Merged-In I50e3649c21bb83ee9130fa98a71560fe261198a9 with SHA-1 6ca8dd1b1a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17545189

Change-Id: Ic5173d033f850f519783db24f8ab09f03789b356
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 08:30:48 +00:00
Xin Li
7f998a1b5b [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e75d9ee3e9 -s ours am: 35cf5330a9 -s ours am: 444e9d38f6 -s ours 
am skip reason: Merged-In I50e3649c21bb83ee9130fa98a71560fe261198a9 with SHA-1 6ca8dd1b1a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17545189

Change-Id: If8a994473492cd2acc448c32d7e73e8685e00048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 08:29:33 +00:00
Xin Li
444e9d38f6 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e75d9ee3e9 -s ours am: 35cf5330a9 -s ours 
am skip reason: Merged-In I50e3649c21bb83ee9130fa98a71560fe261198a9 with SHA-1 6ca8dd1b1a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17545189

Change-Id: I590cbcebf55205c055cc235d52247e1903fab8a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 07:43:39 +00:00
Xin Li
35cf5330a9 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e75d9ee3e9 -s ours 
am skip reason: Merged-In I50e3649c21bb83ee9130fa98a71560fe261198a9 with SHA-1 6ca8dd1b1a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17545189

Change-Id: I28301ae9c1fc09fe18a0d0ce0e2eaa9586f04657
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 07:11:38 +00:00
Yuri Ufimtsev
d16c12b9ac Set up correct ComponentName for test mode of Parental Controls 
Test: manual

Bug: 222339681
Change-Id: I9c141b8f04a69c914a55ed176c2f1c101d22a34c
 2022-04-01 21:28:07 +00:00
Xin Li
e75d9ee3e9 Merge Android 12 QPR3 ab/8391262 
Bug: 226662282
Merged-In: I50e3649c21bb83ee9130fa98a71560fe261198a9
Change-Id: I2a97159d0de32a6262bbace7bb82b09897447bdb
 2022-04-01 20:32:46 +00:00
TreeHugger Robot
dfb59f8d71 [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: b3e3a33a3e -s ours am: cf96e65a6f -s ours am: 9f87ce1cbd -s ours am: a0ee5881ee -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: I4721c73d57276fffcbc68a039895dea6d8dc58bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 20:22:18 +00:00
TreeHugger Robot
a0ee5881ee [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: b3e3a33a3e -s ours am: cf96e65a6f -s ours am: 9f87ce1cbd -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: I1911ffb0d984907ebe88769299ed57a3a4515d95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 19:56:00 +00:00
TreeHugger Robot
73ee5341f3 [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: b3e3a33a3e -s ours am: cf96e65a6f -s ours am: 63acc6e862 -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: Ib5698862b9de359e31c635cb97844dcf6b24f575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 19:55:29 +00:00
TreeHugger Robot
969ee22d41 [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: d3fdbf5def -s ours am: 99fed064c3 -s ours am: bd52c5eba8 -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: I39f41cb388332b5a148bafa4bcd227d5e2611eae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 19:48:43 +00:00
TreeHugger Robot
9f87ce1cbd [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: b3e3a33a3e -s ours am: cf96e65a6f -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: I5c2b69ec2c780d5059ca2777909d439b71fb61e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 19:33:54 +00:00
TreeHugger Robot
63acc6e862 [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: b3e3a33a3e -s ours am: cf96e65a6f -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: Ic52110a7caa0d4a5f5f22ae5337750d86c0e30d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 19:33:02 +00:00
TreeHugger Robot
bd52c5eba8 [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: d3fdbf5def -s ours am: 99fed064c3 -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: I155513591a95536bde86aa4924785dda58f6206f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 19:26:36 +00:00
TreeHugger Robot
ee41654bb0 [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: d3fdbf5def -s ours am: 6241bbab73 -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: Id5a4ce06e223c37de0cc346d39119ae272893331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 19:19:11 +00:00
TreeHugger Robot
cf96e65a6f [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: b3e3a33a3e -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: I7bac3a571de92ee247cbdc6dc60454da472175c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 19:18:35 +00:00
TreeHugger Robot
99fed064c3 [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: d3fdbf5def -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: If816802fc170e71be42443def8565b27d6b78d28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 19:04:28 +00:00
TreeHugger Robot
6241bbab73 [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: d3fdbf5def -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: I9a1b99bd103319b645efb01ec754a850896904a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 19:03:30 +00:00
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
Xiaowen Lei
f3dce9d7d4 Update the function used to log the dream picking events. 
The behavior is identical to before (for StatsLogWriter), but switching
to the generic function with the appropriate field names.

Bug: 213906448
Test: on device via `statsd_testdrive 97`
Change-Id: I241d110b531567cb828a2ed849c79b6595a4b4d1
 2022-04-01 15:28:20 +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