PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,131 Commits 1 Branch 0 Tags
cf26f0465a7cadeb51c470b2e74347902954724c
Commit Graph

105131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Menghan Li
1002ad9963 Merge "Remove "Remove animation" assistive technologies in setup" into tm-dev am: f7b967ffd4 am: efdfca87d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234984

Change-Id: I3128c76608498825ca23763ea5580cecb97d0b42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:27:05 +00:00
Martijn Coenen
534a851e32 Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev am: 63db54c290 am: d77f3426a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944004

Change-Id: I236b236bb1ee60161f900cdf8bd9b64744c0f9f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:27:05 +00:00
Tsung-Mao Fang
c60a7e6109 Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333 am: 7e6dd3f4b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967

Change-Id: I94f2e3ede5caf0bc20e8033b30c4501e1f005c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:26:56 +00:00
Bonian Chen
68f0010133 Merge "[Settings] Broken test fix - SimStatusDialogControllerTest" into tm-dev am: 2d72d9f450 am: 7dcd7194b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234985

Change-Id: I749c9c8a14ee401af175a8c4fad295acf0a8ecfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:26:48 +00:00
TreeHugger Robot
2c5f09d6b6 Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7 am: 24a2986cfa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18236995

Change-Id: I18b23c26645609745f5e155371ddab31fbc7f7ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:26:43 +00:00
Menghan Li
d83bb8f209 Merge "Remove "Remove animation" assistive technologies in setup" into tm-dev am: f7b967ffd4 am: efdfca87d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234984

Change-Id: I8795993faf02a41a9ed201ceca431c900f026e4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:26:39 +00:00
SongFerng Wang
a3a3842259 Merge "Reuse the active esim slot" into tm-dev am: b1613b210d am: 2c7794515d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18235422

Change-Id: Ib3980b61daeb8054a73dbcf94b5084a4e8a7206e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:26:09 +00:00
Chaohui Wang
2d2833cf9b Merge "Fix Voice Access scroll down in the Add network" into tm-dev am: 1107c1c220 am: d6a9c62ff9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158874

Change-Id: I387254e861d77a5986238956ae17dbd9bfd620c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:25:32 +00:00
Tsung-Mao Fang
695503018c Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333 am: 7e6dd3f4b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967

Change-Id: I0a76cbb1f7f4a4df74c8f2932bed22efac696670
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:25:28 +00:00
Bonian Chen
b0877cfa9a Merge "[Settings] Broken test fix - SimStatusDialogControllerTest" into tm-dev am: 2d72d9f450 am: 7dcd7194b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234985

Change-Id: Iea413928ffda34a753c3fc6fa71b2bb29ffe7fa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:25:15 +00:00
TreeHugger Robot
dd348882d7 [automerger skipped] Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7 am: 24a2986cfa -s ours 
am skip reason: Merged-In Ia790e345be811be1b60762ff819544d03c5a18fd with SHA-1 78765b0b26 is already in history

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

Change-Id: I98a0e575e6efa4d2520c7d5e16f8c02aa3b94dcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:25:05 +00:00
SongFerng Wang
33f243f937 Merge "Reuse the active esim slot" into tm-dev am: b1613b210d am: 2c7794515d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18235422

Change-Id: I60c6ac651c4043978fee7969057ec7d1dc3c0a70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:24:35 +00:00
Chaohui Wang
ec4a4248a2 Merge "Fix Voice Access scroll down in the Add network" into tm-dev am: 1107c1c220 am: d6a9c62ff9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158874

Change-Id: I6db1ad4f0e5c9bbd66fa009d8bb74d22bb9c349e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:23:52 +00:00
Yanting Yang
f79c8af9dc Merge "Fix reset app preferences for work profile apps" into tm-dev am: 51204e3deb am: 7031c01a9c am: 604c3c3f22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234983

Change-Id: Ibc647906b3961bd9c3d703de990c08266dba5f2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:20:23 +00:00
Martijn Coenen
c696bdbaa4 Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev am: 63db54c290 am: cf79b0fcf0 am: ffef837a93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944004

Change-Id: I2bfcae49748ec67f73e1582cbd94a81a36e599db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:20:17 +00:00
Menghan Li
93720ec860 Merge "Remove "Remove animation" assistive technologies in setup" into tm-dev am: f7b967ffd4 am: 347aa6f934 am: 56665fb64f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234984

Change-Id: I56e1419c6c8056647a6f8d8d2b3cbe51b887e384
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:19:34 +00:00
Tsung-Mao Fang
984cbd60ba Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333 am: 4e09433546 am: 551d742d83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967

Change-Id: Ia7c2fa6739d2b424601ef0f9d637095af7c91836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:19:26 +00:00
Bonian Chen
128df146c2 Merge "[Settings] Broken test fix - SimStatusDialogControllerTest" into tm-dev am: 2d72d9f450 am: 657a4f7549 am: aea13c2400 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234985

Change-Id: I3340d34300a9e4a8d937b822aa2a805e3e7125ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:18:54 +00:00
TreeHugger Robot
22e20f3d18 Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7 am: 31b30c123c am: 241baf7389 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18236995

Change-Id: I62261e6f9143b1de9d2c2f5181fda2447a4b226f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:18:49 +00:00
SongFerng Wang
0331308709 Merge "Reuse the active esim slot" into tm-dev am: b1613b210d am: 992e20d2af am: 4f0d8249a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18235422

Change-Id: I8aa5478ca624312e5857be3623f13cc70d87b6e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:18:34 +00:00
Chaohui Wang
c0f056a185 Merge "Fix Voice Access scroll down in the Add network" into tm-dev am: 1107c1c220 am: b36e15c613 am: 708e5e6ab4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158874

Change-Id: I35d89a835dd04792ce235791722abb406d3d3dcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:18:01 +00:00
Chaohui Wang
bf652e736b Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de am: 61161eab14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715

Change-Id: Id7a976c328f4d18b0e1c55509e18d7275959b894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:17:41 +00:00
Bonian Chen
129c031930 Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9 am: b0e2411297 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632

Change-Id: I78c11555c80bd7ead868925dc598640af78d6d47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:17:29 +00:00
TreeHugger Robot
2d72c0e67e Merge "Fix More details not work on fingerprint" into tm-dev am: cb38753530 am: 3433f8a9b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197508

Change-Id: I0a3fce15a10b5d7ee2ab2cc1efd98fc02b6c695c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:17:24 +00:00
Chaohui Wang
0c6af8944e Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de am: 61161eab14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715

Change-Id: I2499336550a497edee24391a1075c2756e378f98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:16:41 +00:00
Bonian Chen
e792ffe112 Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9 am: b0e2411297 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632

Change-Id: Ia2e728dbe365d2a6a70b95c103a215468ae72500
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:16:31 +00:00
TreeHugger Robot
83e71c22e7 Merge "Fix More details not work on fingerprint" into tm-dev am: cb38753530 am: 3433f8a9b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197508

Change-Id: I2105b2a1c8077cc3fb11b88d5b899a2ee69cae48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:16:25 +00:00
Bill Yi
9825da46ff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7ada1a1b2e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1bfdae40e320f140b44a8a3879d64aed5a377de0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:15:33 +00:00
Bill Yi
b781b9c38d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 196ff79720 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iae86de36449cf9df242d79cec297cdab3d0596e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:15:18 +00:00
Bill Yi
059234f150 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5898a6df49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb037cd0b42f56367d8d909e7d8ebb39adeef567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:14:59 +00:00
Bill Yi
b6d3b477ea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7ada1a1b2e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib76367d30830b5561e59510cc0395c18bad4ea90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:14:50 +00:00
Bill Yi
72fbe398ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f4c7931e46 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83543ee334f01915c02477444bc2222059f73df9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:14:46 +00:00
Bill Yi
bc00cbb900 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 196ff79720 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I395c2cf49d31635f61de481e9f0fb69d29141e7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:14:34 +00:00
Bill Yi
66101cee32 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5898a6df49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7b3ea867cdce14ea1cc640daadbe5d6f1cef7915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:14:16 +00:00
Bill Yi
834950e817 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f4c7931e46 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0cbcd3b23e9d7064304c6e399e1901caf5449b22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:14:02 +00:00
TreeHugger Robot
a6e210ff8a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: fbbd1f1109 -s ours am: f8181ea933 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I632d24168c822a628be984329b92092fd5fd7ba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:12:40 +00:00
The Android Open Source Project
379f19fb30 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5116946868 -s ours am: 9db4d03357 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice5d6b5acbd36f34f1479b38c10c721f58621404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:12:38 +00:00
TreeHugger Robot
defb287459 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ffe35d0df -s ours am: 176fb51f4f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic3f7c058e9817498993dc841a7ea2b02c0f0c991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:12:35 +00:00
The Android Open Source Project
44bf820478 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5b6c71281 -s ours am: 0e3016543c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I241ffe0a108faaaf71d73974f5264a0705b2862e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:12:27 +00:00
TreeHugger Robot
8348e67936 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1b42795ed4 -s ours am: ab1590098a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic79661bf9ca113631aea4cffb4f7908bfb921937
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:12:21 +00:00
Bill Yi
03e09d6366 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9fd2b9fbcc -s ours am: 54784f7246 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibec5d89bc4fd96a288890bbc43828543ed07afc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:12:10 +00:00
TreeHugger Robot
2825fdf175 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8e13f26686 -s ours am: 89707b8827 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I30db5a72651d5f60373d56d595facf8651775cdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:11:56 +00:00
Bill Yi
6921b850c3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4cbb2ea010 -s ours am: 44717d3500 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2f7a49df88aa8152d87281ce41eb6130b6bbfab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:11:46 +00:00
TreeHugger Robot
435a8ae837 Merge "Hide running time for "Android System" in the optimization page" into tm-dev am: 10190793fe am: ccd8147776 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234990

Change-Id: Iaa804c69d8744a07de575fd57c57eede2ca6a7b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:06:33 +00:00
Bonian Chen
c8433b8435 Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev am: 812de51467 am: 33bc83f19e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18231805

Change-Id: I979f44db2bc52cdef0b1e48a88457856a10cfda5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:06:04 +00:00
TreeHugger Robot
97b69588df Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 am: 0c8f044705 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: I2c1a1466175300be585c3920c6f9e43e63012a6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:05:19 +00:00
Automerger Merge Worker
78fa65b2be Merge changes from topic "am-38c2777666e34c669ef9b159b634e16f" into tm-d1-dev-plus-aosp 
* changes:
  Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 am: 0c8f044705
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: d4631b0d42 -s ours
 2022-05-10 21:05:15 +00:00
Bill Yi
1fcabe2452 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: d4631b0d42 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I54bc21e568474fa36f7537c5b4c31707ac7cad0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:05:07 +00:00
Yanting Yang
604c3c3f22 Merge "Fix reset app preferences for work profile apps" into tm-dev am: 51204e3deb am: 7031c01a9c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234983

Change-Id: Ib554be5157dd5cb5d39902eb75b71fa2490d62df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:04:09 +00:00
TreeHugger Robot
ade25b3d36 Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 am: 0c8f044705 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: I3145ff5669671b4f26f4d7072591dcdf76f201f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:03:52 +00:00