Commit Graph

105131 Commits

Author SHA1 Message Date
Tsung-Mao Fang
f2f8618d62 Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333 am: 7e6dd3f4b7 am: 695503018c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967

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

Change-Id: If874e14505ec918d41e2b1c9b0dd0b3dff94d264
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:59:30 +00:00
Bill Yi
54859fcba0 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: d4631b0d42 -s ours am: 1fcabe2452 -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: Id0945269a4971aef0c482a3627b4658b03c5bcc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:59:13 +00:00
Bonian Chen
66a399a0c6 Merge "[Settings] Broken test fix - SimStatusDialogControllerTest" into tm-dev am: 2d72d9f450 am: 7dcd7194b4 am: b0877cfa9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234985

Change-Id: I2e7169a192d8be56f73f88da1443a484a6bf4407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:53:01 +00:00
Jack He
33a080ad7a Merge "Only cancel bonding if pair button is not pressed" 2022-05-10 21:47:29 +00:00
TreeHugger Robot
b0d71d1043 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: fbbd1f1109 -s ours am: ebd68c7887 -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: Ia17aa19f4ce5f1fae9d5e7698e18cfcdccd70f62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:45:45 +00:00
The Android Open Source Project
4b0eb1dc24 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5116946868 -s ours am: 49f9188b85 -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: I1695505826988991ced7ecfef1ec06f3feb3a02c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:45:40 +00:00
TreeHugger Robot
8e2f0d185c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ffe35d0df -s ours am: 25f2aa6a3d -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: Ib8be063e7e7cc43ddb1ff9cbe338b6769c5bab82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:45:37 +00:00
The Android Open Source Project
4e9b715f99 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5b6c71281 -s ours am: 74cd0c684a -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: I037dcf02dbd37443983765a83410869ba61f5a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:45:35 +00:00
TreeHugger Robot
9da61aad1b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1b42795ed4 -s ours am: 7b9337e2e6 -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: I72631a9fbaa7e2c65a394bccdf394803eb1834c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:45:25 +00:00
Bill Yi
085d671893 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9fd2b9fbcc -s ours am: 0cab12760b -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: I5ca34dd199bff7a615a3f63363089fcf919f2053
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:45:13 +00:00
TreeHugger Robot
cefcc7ec87 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8e13f26686 -s ours am: 2756f55628 -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: Ibeea7caf1d16a07ac03a910bfd6f2a1cd49708c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:44:58 +00:00
Bill Yi
88a0fb3590 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4cbb2ea010 -s ours am: e8c70cb6a2 -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: I2037819b1707c24d17253c9699a4e56f78122126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:44:46 +00:00
TreeHugger Robot
783967426b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: fbbd1f1109 -s ours am: ebd68c7887 -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: I431cd90e3d8108e48f6df74d70569ecba74fa8c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:44:26 +00:00
The Android Open Source Project
e826459b9a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5116946868 -s ours am: 49f9188b85 -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: Ibcc0840b325b49892161889986d6a99c80e536c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:44:25 +00:00
TreeHugger Robot
403ce6771b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ffe35d0df -s ours am: 25f2aa6a3d -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: I002752680216d0ac31658ab2513c524d1c22733f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:44:22 +00:00
The Android Open Source Project
5a5f7e98f9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5b6c71281 -s ours am: 74cd0c684a -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: Ieafb7a381bbe99c9721c8a04728afdcec60c3b1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:44:12 +00:00
TreeHugger Robot
8cacd20ff9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1b42795ed4 -s ours am: 7b9337e2e6 -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: I8e8d9e5988e8beff565ad986dc369f68d1396e1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:44:06 +00:00
Bill Yi
3e4933f7c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9fd2b9fbcc -s ours am: 0cab12760b -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: I60e26b76539f597f4cb905a50f924c2e12202c29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:43:56 +00:00
TreeHugger Robot
7603b65c30 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8e13f26686 -s ours am: 2756f55628 -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: I7ccc9d31a277454d740c459c42f3b34987ffd3a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:43:43 +00:00
Bill Yi
414952c8fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4cbb2ea010 -s ours am: e8c70cb6a2 -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: I545ca5c3e287940afb5f8a82bc80d216698e36ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:43:31 +00:00
TreeHugger Robot
8b8c3b45bd [automerger skipped] Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7 am: 24a2986cfa -s ours am: dd348882d7 -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: I000b0d7b4c2f3857f29ecad353ae390d79a2e750
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:43:11 +00:00
SongFerng Wang
8a60ff49d3 Merge "Reuse the active esim slot" into tm-dev am: b1613b210d am: 2c7794515d am: 33f243f937
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18235422

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

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

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

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

Change-Id: I509be229945588df8a0550f948ced3c1a34a7a78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:41:47 +00:00
Bill Yi
92b1facae8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7ada1a1b2e -s ours am: b6d3b477ea -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: Id727251382d82161a93a5ff568b39c1fb9aa2f85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:41:06 +00:00
Bill Yi
8607a8f1be [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 196ff79720 -s ours am: bc00cbb900 -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: I6b9a2f92f5ad739b769157b0c70158556cd78d80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:40:53 +00:00
Bill Yi
630d664d54 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5898a6df49 -s ours am: 66101cee32 -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: Ifeaa181c178247f4960823c2146ff0d21a48252b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:40:35 +00:00
Bill Yi
eb9c5ef350 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f4c7931e46 -s ours am: 834950e817 -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: I6f945aab568aaa70b6c08b7fa8c6094fd6a5b4e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:40:19 +00:00
TreeHugger Robot
d748407e29 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: fbbd1f1109 -s ours am: f8181ea933 -s ours am: a6e210ff8a -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: Ic6266aacfb977eb0ef2f9c392691a55ec9c4d61c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:35:51 +00:00
The Android Open Source Project
da915ac7fd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5116946868 -s ours am: 9db4d03357 -s ours am: 379f19fb30 -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: Ia6c70ed3f6b7129e329305584cb9b4825e64ced8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:35:48 +00:00
TreeHugger Robot
01000b104f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ffe35d0df -s ours am: 176fb51f4f -s ours am: defb287459 -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: I27090203f486224e3032d8548fc109a6727bc427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:35:44 +00:00
The Android Open Source Project
7311b730bf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5b6c71281 -s ours am: 0e3016543c -s ours am: 44bf820478 -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: Iaed80cc05796029db110c081bd06246a9278861a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:35:39 +00:00
TreeHugger Robot
5bee6c031a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1b42795ed4 -s ours am: ab1590098a -s ours am: 8348e67936 -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: I126b2356985e76d2c8d63866b97d4e3d167b7b11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:35:30 +00:00
Bill Yi
94e58a49f0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9fd2b9fbcc -s ours am: 54784f7246 -s ours am: 03e09d6366 -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: Iacec75007270df362373862a5f95433700327cd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:35:21 +00:00
TreeHugger Robot
15c41cec8f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8e13f26686 -s ours am: 89707b8827 -s ours am: 2825fdf175 -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: I5dd3a616d7660b8611dc25edd94e46bda085f965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:35:07 +00:00
Bill Yi
8fea7472e7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4cbb2ea010 -s ours am: 44717d3500 -s ours am: 6921b850c3 -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: Id12750479e83a231f9ffd37e300175f7b9e2ea2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:34:53 +00:00
TreeHugger Robot
bfeff3bfc6 Merge "Hide running time for "Android System" in the optimization page" into tm-dev am: 10190793fe am: ccd8147776 am: 435a8ae837
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234990

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

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

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

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

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

Change-Id: I5aa57abe71abab5357d3e209ef44a042a09e1952
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:27:57 +00:00
Automerger Merge Worker
00149b77bd Merge changes from topic "am-38c2777666e34c669ef9b159b634e16f" into tm-d1-dev-plus-aosp am: 78fa65b2be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: Ib0fb1a2595796999f1d89603bfb0f5c8a85e92cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:27:42 +00:00
Martijn Coenen
85f1effe66 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: I6c08f9736d1e497ce01379e83f2ab2827b75887b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:27:41 +00:00
Bonian Chen
2dad1245e6 Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev am: 812de51467 am: 2a1040e1e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18231805

Change-Id: Ibf0abdef4c8b962f897c2a38983e20f8434fd3a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:27:39 +00:00
Bill Yi
010e310498 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: d4631b0d42 -s ours am: 22623e17a7 -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: I0f84136bd0bc1747dd4a6f05968b6f2edd4099d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:27:31 +00:00
Yanting Yang
641b5b67b0 Merge "Fix reset app preferences for work profile apps" into tm-dev am: 51204e3deb am: 799f7218cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234983

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