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

102407 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
7e82f77aed [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1f881c6e86 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a74afc8b96709b225c760986ae3bdcb215f6713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 18:18:21 +00:00
Bill Yi
c15c29851a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac9baaee08 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08938b246f731d42fbe481a554eb275e7b38e13f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 18:18:08 +00:00
TreeHugger Robot
8c6668cd03 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1f881c6e86 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e50a31578e4289e72d932fc9df3edb4e8297150
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 18:17:31 +00:00
Bill Yi
346d3a8459 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac9baaee08 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I27cc7eb93246429765820f51c926f12a72a4adfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 18:17:30 +00:00
TreeHugger Robot
7a387514d8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 3c7d6ac0e5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia42e9687c386dd2828fce0b4b2904508ff9adf11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 18:10:43 +00:00
Bill Yi
8973feec74 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b387657974 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e146b75a399d0523b4df567931d98a391d94270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 18:10:23 +00:00
TreeHugger Robot
1f881c6e86 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-29 17:54:31 +00:00
TreeHugger Robot
3c7d6ac0e5 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-03-29 17:51:45 +00:00
Aaron Liu
c138118d48 Home Controls: Add conditional copy for setting. 
Add conditional copy for when allow trivial devices setting is disabled.
Add guidance on how to enable it.

Bug: 227344249
Test: Manual and unit test
Change-Id: I0f2f6dc933804ee6ba15dc180dc717d2a5b729a5
 2022-03-29 17:27:17 +00:00
Treehugger Robot
bde7565383 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d35c876857 -s ours am: 178ba3e57d -s ours am: 0818a1c62b -s ours am: 997bdcf8f8 -s ours am: 8c98f0296d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I74b3a8329128eb11d1f9cd5d25ab2d325379c627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:33:28 +00:00
Bill Yi
6fd530eb0a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38de1eab21 -s ours am: 5f55cb2ed8 -s ours am: 2b1435d300 -s ours am: cbb3ac7c9e -s ours am: 98fd319aba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I43f5e70e1d06264ed41f0e8ffa0c10a156dffc54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:33:27 +00:00
Treehugger Robot
d3affe74a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 65c7ff0276 -s ours am: 3ad321509f -s ours am: c5142845f8 -s ours am: cb0150bde0 -s ours am: 243e18d857 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iefd195d5e55a2f8bb83630afd6300e8ce59a83c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:33:17 +00:00
Bill Yi
e3e2f8c9ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62dc714628 -s ours am: b28c27e68e -s ours am: e68d843167 -s ours am: 5729190b77 -s ours am: 0166aae999 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4fefc2cb47f66f74e28bad2d353f01c9a4d191f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:33:15 +00:00
TreeHugger Robot
6b18320374 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 97539de67e -s ours am: 0e536d93b5 -s ours am: 2e4f458627 -s ours am: d8ef930b69 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I29f1a7f56cb05523991adea25b971ce37eaaa801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:33:05 +00:00
Bill Yi
4fee4d4fa0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b50ee2d6 -s ours am: cc3a93e23b -s ours am: f0886d920c -s ours am: f3b2661db4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iace7ee34ba76d0d0e908ac5156e56259efe3375d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:33:04 +00:00
TreeHugger Robot
4a4db9bd09 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4d9878828e -s ours am: 2703c29227 -s ours am: e5091256f4 -s ours am: c28707b38e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I853ca375c9839f4990eb94abf2ffcaa2030ac88b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:32:49 +00:00
Bill Yi
bafdb0a4ed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e58dde841 -s ours am: 620782b9d4 -s ours am: 78bfe2c604 -s ours am: fd71e4b975 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie1bdc8cf7de940243f230177282ab66072da1228
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:32:48 +00:00
Peter Wang
703f40727e [automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 0ab2226dff -s ours am: 4f5dbc4db4 -s ours am: 886b22a7a6 -s ours am: c7e49878b8 -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 6879183335 is already in history

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

Change-Id: Ifac871fba8dc2e9ddeb145ffff866bbcab61b55b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:32:30 +00:00
Treehugger Robot
a7f9aa8f72 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d35c876857 -s ours am: 178ba3e57d -s ours am: 0818a1c62b -s ours am: 997bdcf8f8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44f0a73d229b51e4e096597ea193adfe5c2accd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:48 +00:00
Bill Yi
bd302a282f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38de1eab21 -s ours am: 5f55cb2ed8 -s ours am: 2b1435d300 -s ours am: cbb3ac7c9e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic98c2d093680839a55e4bb3e12ecfdfe8e3973ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:47 +00:00
Treehugger Robot
8c98f0296d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d35c876857 -s ours am: 178ba3e57d -s ours am: 0818a1c62b -s ours am: 997bdcf8f8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I92eb6b101e2c4dbdf1c04579e0641cdd8380b91f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:38 +00:00
Bill Yi
98fd319aba [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38de1eab21 -s ours am: 5f55cb2ed8 -s ours am: 2b1435d300 -s ours am: cbb3ac7c9e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4720ac13081819a9c47c7c3e7e9eac1c7c626e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:37 +00:00
Treehugger Robot
c9ebd6bd00 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 65c7ff0276 -s ours am: 3ad321509f -s ours am: c5142845f8 -s ours am: cb0150bde0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic8a4d80c3bd4c0680fce773007f97cbc2bacfcaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:37 +00:00
Bill Yi
5162d576e7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62dc714628 -s ours am: b28c27e68e -s ours am: e68d843167 -s ours am: 5729190b77 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1b4183c85c31100bf0a0ab8549a3dcc15c28f692
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:35 +00:00
Treehugger Robot
243e18d857 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 65c7ff0276 -s ours am: 3ad321509f -s ours am: c5142845f8 -s ours am: cb0150bde0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I80cc502b305fe4ba1936fc2d8d0d459475f25752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:29 +00:00
Bill Yi
0166aae999 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62dc714628 -s ours am: b28c27e68e -s ours am: e68d843167 -s ours am: 5729190b77 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9788d84a57eefdd8794e1af790cdc78821a40b7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:28 +00:00
TreeHugger Robot
e4f6e79445 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 97539de67e -s ours am: 0e536d93b5 -s ours am: 2e4f458627 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic228723d03a5d5622e293b1e848a4e42cb583ee3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:26 +00:00
Bill Yi
ff3c2221f3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b50ee2d6 -s ours am: cc3a93e23b -s ours am: f0886d920c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If79331b9030dd952b75594159a28be751752f72e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:24 +00:00
TreeHugger Robot
d8ef930b69 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 97539de67e -s ours am: 0e536d93b5 -s ours am: 2e4f458627 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2bfabd4b816f1ea2891992e3aa08efc3a09b66fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:20 +00:00
Bill Yi
f3b2661db4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b50ee2d6 -s ours am: cc3a93e23b -s ours am: f0886d920c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I14c3dec853939107738e8e6cb8f1ff2687c04026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:19 +00:00
TreeHugger Robot
24f17a1006 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4d9878828e -s ours am: 2703c29227 -s ours am: e5091256f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I953a9d7106d87e0129409ea509755a6d616e8ac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:16 +00:00
Bill Yi
ca81a01111 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e58dde841 -s ours am: 620782b9d4 -s ours am: 78bfe2c604 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I21abb0636c3f1fc08ad4f2086bf69a7b2469096c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:15 +00:00
TreeHugger Robot
c28707b38e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4d9878828e -s ours am: 2703c29227 -s ours am: e5091256f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I72f30a7906c9145b8b3632ad1a00c25d8e191c40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:13 +00:00
Bill Yi
fd71e4b975 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e58dde841 -s ours am: 620782b9d4 -s ours am: 78bfe2c604 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If6852a1ac855e2f46c002e902f2f4cdc4b4e8c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:11 +00:00
Peter Wang
6e30be0710 [automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 0ab2226dff -s ours am: 4f5dbc4db4 -s ours am: 886b22a7a6 -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 6879183335 is already in history

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

Change-Id: I20569322b84c96d31aadb5a28be7541f0b45a54e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:01 +00:00
Peter Wang
c7e49878b8 [automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 0ab2226dff -s ours am: 4f5dbc4db4 -s ours am: 886b22a7a6 -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 6879183335 is already in history

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

Change-Id: I43a678f4b949e1c864a2b5f8e3a85e71d36e6e9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:08:54 +00:00
Treehugger Robot
997bdcf8f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d35c876857 -s ours am: 178ba3e57d -s ours am: 0818a1c62b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If33b9f681a6b7b9fd3380ff95df68dda0a80513c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:48:01 +00:00
Bill Yi
cbb3ac7c9e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38de1eab21 -s ours am: 5f55cb2ed8 -s ours am: 2b1435d300 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I080bbfcbed46db28ef9b31a72ce4236a9a625a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:47:59 +00:00
Treehugger Robot
cb0150bde0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 65c7ff0276 -s ours am: 3ad321509f -s ours am: c5142845f8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I13faeea594a89e382f067a237440adf9183bd33a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:46:11 +00:00
Bill Yi
5729190b77 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62dc714628 -s ours am: b28c27e68e -s ours am: e68d843167 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1d32837fd68effe1470001964dd08c8a4463dfd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:46:07 +00:00
TreeHugger Robot
2e4f458627 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 97539de67e -s ours am: 0e536d93b5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I137bd8e32d90c1bb3691d53633fe9e86cf2562a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:38:58 +00:00
Bill Yi
f0886d920c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b50ee2d6 -s ours am: cc3a93e23b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I84bf0cdc0c3d2fef27883a04efc2944be2e6044e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:38:56 +00:00
TreeHugger Robot
e5091256f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4d9878828e -s ours am: 2703c29227 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I64ca7d3f6fc6d9e3668f0a08d3fd1f58f9a79d86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:38:30 +00:00
Bill Yi
78bfe2c604 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e58dde841 -s ours am: 620782b9d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2bae1da3c62063d6ae7544cb863a8d34952252fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:38:28 +00:00
Yuri Ufimtsev
183c3f965b Fix typo in Preference definition for Security Advanced Settings 
Test: manual

Bug: 191735388
Change-Id: I9156a5d670e12a1249504cc9eb27ed1c2ef59bfc
 2022-03-29 15:09:33 +00:00
Peter Wang
886b22a7a6 [automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 0ab2226dff -s ours am: 4f5dbc4db4 -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 6879183335 is already in history

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

Change-Id: I3555813a6c257b9a084febc50b50ebd0936df3e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:09:30 +00:00
Sarah Chin
4448b772ed [automerger skipped] Merge "[MEP] Use switchToSub API with pending intent" am: 1abef7542a am: 9b9c5f2f93 am: 61ec9b6d70 -s ours am: a8312161c7 -s ours am: a0ddaeb7c3 -s ours 
am skip reason: Merged-In I800b26c0eed8243a5f1c5ae8b7c42d1f9cfdb205 with SHA-1 e28eaa725d is already in history

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

Change-Id: Id49e4bb1a16d03d5dc531f9fb304cbcc1707aa5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 14:51:37 +00:00
Sarah Chin
eae173e823 [automerger skipped] Merge "[MEP] Use switchToSub API with pending intent" am: 1abef7542a am: 9b9c5f2f93 am: 61ec9b6d70 -s ours am: a8312161c7 -s ours 
am skip reason: Merged-In I800b26c0eed8243a5f1c5ae8b7c42d1f9cfdb205 with SHA-1 e28eaa725d is already in history

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

Change-Id: I7f995b09dcdab990964ce9e56946d468c400c88e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 14:42:47 +00:00
Sarah Chin
a0ddaeb7c3 [automerger skipped] Merge "[MEP] Use switchToSub API with pending intent" am: 1abef7542a am: 9b9c5f2f93 am: 61ec9b6d70 -s ours am: a8312161c7 -s ours 
am skip reason: Merged-In I800b26c0eed8243a5f1c5ae8b7c42d1f9cfdb205 with SHA-1 e28eaa725d is already in history

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

Change-Id: I861481b35d5bfba7c6052b83901a1620e3b12a98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 14:41:09 +00:00
Sarah Chin
a8312161c7 [automerger skipped] Merge "[MEP] Use switchToSub API with pending intent" am: 1abef7542a am: 9b9c5f2f93 am: 61ec9b6d70 -s ours 
am skip reason: Merged-In I800b26c0eed8243a5f1c5ae8b7c42d1f9cfdb205 with SHA-1 e28eaa725d is already in history

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

Change-Id: Ic6ca95a4fb388ef93b63135e7064932406eec83a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 14:22:52 +00:00