PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
107,090 Commits 1 Branch 0 Tags
b1144f95e2c09858a6fb19a0df5ad2dfc3e0873c
Commit Graph

107090 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Huang
9a339e9d16 Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: I1384bf966c0afc391f97d64c389747fe307497cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 05:09:48 +00:00
Daniel Huang
90292ac568 Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: Ic87b8e0584bae55115e5bc791ceccc3c2c81548e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 05:08:32 +00:00
Daniel Huang
1737ce56fc Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: Ifb20f828c374e2a003d9d0b0f6af98ab50810afb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 05:08:22 +00:00
Tsung-Mao Fang
cb641fa6eb Show slice without toggle when there's no wifi permission 
When the presenter app doesn't have certain permissions,
it's safer to go with a generic fallback slice
which just redirects user to the actual settings page.

Test: test on the presenter app. robo test
Fix: 178014725
Change-Id: I6f5358af2e00cb2fedba0b3f1474a026135986c6
 2022-05-05 12:05:38 +08:00
Daniel Huang
74b1027fe2 Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev 2022-05-05 03:46:47 +00:00
Joseph Oh
a9f4f09626 Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf 
Bug: 231491884
Change-Id: I5c16cee342da0541c5f2540c6fdc417e668fe0f4
 2022-05-05 03:23:25 +00:00
Jay Thomas Sullivan
5efeddcdbe Add PRIVACY_ADVANCED_SETTINGS intent 
Redirect intent actions for PRIVACY_ADVANCED_SETTINGS to the privacy
screen.

Rationale:

1. The existing PRIVACY_SETTINGS intent will later be redirected to
   safety center, but

2. We will still need a way to intent to this screen, because this
   screen will be re-used and renamed to "More privacy settings", also
   known as "Advanced privacy settings"

Test: manual
Change-Id: I83cb3935e16887683f3907d9d71ccd7c53e24202
 2022-05-04 22:14:12 +00:00
Xin Li
fb06539bae [automerger skipped] Merge "Merge SP2A.220505.002" am: 8adb561455 -s ours am: 2a6d8885bc -s ours am: 9895e8e63b -s ours am: e5d25d91a6 -s ours am: c451743c29 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I0fac990f4261bcab21be06570a3ea2680c2abe6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 22:08:10 +00:00
Xin Li
c59d502f3b [automerger skipped] Merge SP2A.220505.002 am: c3a9ea7443 -s ours am: 90645fb925 -s ours am: 6c49c6dbcd -s ours am: 92e90faa5c -s ours am: 14807f68b6 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: Ib6269ab9480935bf645a44a4f09567333bd6be57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 22:07:59 +00:00
Xin Li
c451743c29 [automerger skipped] Merge "Merge SP2A.220505.002" am: 8adb561455 -s ours am: 2a6d8885bc -s ours am: 9895e8e63b -s ours am: e5d25d91a6 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I1970ab4a3c30e9b7b07691b0764bf8227ab931b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 21:50:32 +00:00
Xin Li
14807f68b6 [automerger skipped] Merge SP2A.220505.002 am: c3a9ea7443 -s ours am: 90645fb925 -s ours am: 6c49c6dbcd -s ours am: 92e90faa5c -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I700946ecc115f36ee95ca5ed94c268cb9000324a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 21:50:21 +00:00
Xin Li
e5d25d91a6 [automerger skipped] Merge "Merge SP2A.220505.002" am: 8adb561455 -s ours am: 2a6d8885bc -s ours am: 9895e8e63b -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I89ef935da4e4cd866d0300ab387aff6a1ef23072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 21:28:29 +00:00
Xin Li
92e90faa5c [automerger skipped] Merge SP2A.220505.002 am: c3a9ea7443 -s ours am: 90645fb925 -s ours am: 6c49c6dbcd -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I20d6a10afd7b33ce095b5d1b847995d64d1a0b8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 21:28:18 +00:00
Xin Li
9895e8e63b [automerger skipped] Merge "Merge SP2A.220505.002" am: 8adb561455 -s ours am: 2a6d8885bc -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I9ee9deabfbe58ece7df81f88733417d5b733898b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 21:20:20 +00:00
Xin Li
6c49c6dbcd [automerger skipped] Merge SP2A.220505.002 am: c3a9ea7443 -s ours am: 90645fb925 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: Iec2ab168e50ca7aecbe67626131c46b7d576a439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 21:20:09 +00:00
Xin Li
2a6d8885bc [automerger skipped] Merge "Merge SP2A.220505.002" am: 8adb561455 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I1328a5b1eec08a2d30940f610911af8978153c5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:57:11 +00:00
Xin Li
90645fb925 [automerger skipped] Merge SP2A.220505.002 am: c3a9ea7443 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: Ib4481f34e89f88b1a74baebdc5499460fe10b2e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:56:53 +00:00
Bill Yi
e1511c2982 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8c0d18ada4 -s ours am: 7034e737b6 -s ours am: 5a078b4970 -s ours am: 4d6d37508c -s ours am: 87a93a66d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia62ab8a79980ecd2beaa6f958d53f65fc2059ea1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:32:43 +00:00
Xin Li
8adb561455 Merge "Merge SP2A.220505.002" 2022-05-04 20:30:21 +00:00
Bill Yi
767f4f545b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8c0d18ada4 -s ours am: 7034e737b6 -s ours am: 8b81a28364 -s ours am: f8855596aa -s ours am: a4ead53932 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9df2f235a174c47768829495a3a9a6dc1b989791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:29:25 +00:00
Bill Yi
e792b0d592 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8c0d18ada4 -s ours am: 7034e737b6 -s ours am: 5a078b4970 -s ours am: b84b97b153 -s ours am: 939cde7403 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic3dd7d21c97e8bdd914f19265f5c8455d14cf9f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:28:02 +00:00
Automerger Merge Worker
f0568923b9 Merge changes from topic "am-96db44aa4dfa4e4485d74486d8ea6f46" into tm-d1-dev-plus-aosp am: 9414c443d5 am: 640611b924 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099393

Change-Id: I6723246bde0d7b815c112184df36e18242429ff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:26:36 +00:00
Bill Yi
979c55d908 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9349330a1f -s ours am: 6b59002229 -s ours am: 799c8e2d7e -s ours am: aa298f73f6 -s ours am: f1b4c2ac06 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic9856781770905671391bc4dc792af9009a91e75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:26:21 +00:00
Julia Reynolds
4138b6f68a Remove notification permission feature flag 
Tes: Settings notification robotests
Bug: 231344755
Change-Id: I3e35eede94ea88bee4c2e7fc03ce998ed68b4f81
 2022-05-04 16:24:23 -04:00
Bill Yi
a48d2a3c35 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9349330a1f -s ours am: 6b59002229 -s ours am: 467d913a6a -s ours am: 5970cabb76 -s ours am: b2579c483d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I841ab8b8c0286b7dc91ead4d4596065993b748de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:22:22 +00:00
Bill Yi
2bea8b32f3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106 -s ours am: da1aaa3069 -s ours am: 71fc7ec758 -s ours am: 670172f665 -s ours am: 884ec31b20 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie3317985b046d64f729e6396869a5b5eba6dcd2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:22:09 +00:00
Automerger Merge Worker
c663a58aa2 Merge changes from topic "am-9fa7d80b21934066ba9777d72c99d3a2" into tm-d1-dev-plus-aosp am: 4491a88ed8 am: 9957c467e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: I056e82cc220f254fb4559887e416603c5cde3551
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:17:17 +00:00
Bill Yi
36a01f5295 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0 am: c50bf31396 -s ours am: 58da6d7afd -s ours am: a2943f2e3a -s ours am: 58e97a4746 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic3e8c74ef39f006e9f434354f1e2c483171e3036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:17:12 +00:00
Bill Yi
75541e8438 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9349330a1f -s ours am: 6b59002229 -s ours am: 799c8e2d7e -s ours am: b506123bad -s ours am: 566baad6bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd3437d6b78c24778307d7e065303d5bf2ef5eae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:11:53 +00:00
Bill Yi
acd5abd4a7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106 -s ours am: da1aaa3069 -s ours am: 7463359b05 -s ours am: 649022d0f9 -s ours am: 224cea2d4f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I239b47c33314895998693b3ee0cd6fedaf8f074c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:11:41 +00:00
Bill Yi
b9868733db Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf am: b8f6039a2a am: b76604c461 am: 621712f1a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: I820722f348f076eea575e402755ba1209721e77b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:04:22 +00:00
Bill Yi
7eeb35888d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0 am: c50bf31396 -s ours am: d7503db15f -s ours am: ae99e62db9 -s ours am: cb97a038c6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9f4349e1ab5b2bb8aff8dbce8fbedcc847f40a5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:04:19 +00:00
Bill Yi
f7234f9d3d Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf am: a467f9dcba am: 4872c85344 am: 6f2c137f85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: If20e8177816335763cca686761f6f2b2121ba33b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 19:58:19 +00:00
Bill Yi
7fd35e5153 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0 am: c50bf31396 -s ours am: 58da6d7afd -s ours am: 8cd5792307 -s ours am: ad7dda471e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0408b5f132fa2b5864135a56647f2db7f166c6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 19:58:14 +00:00
Raphael Kim
ff34195604 Extract app label from component name in notification access confirmation UI 
Bug: 228178437
Test: Manually tested on POC
Change-Id: I8613d9b87a53d4641c0689bca9c961c66a2e9415
 2022-05-04 19:41:13 +00:00
Bill Yi
87a93a66d5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8c0d18ada4 -s ours am: 7034e737b6 -s ours am: 5a078b4970 -s ours am: 4d6d37508c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iadd961e92d9a1bda5b2c4c18a3ac1461981e3bb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:59:44 +00:00
Bill Yi
a4ead53932 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8c0d18ada4 -s ours am: 7034e737b6 -s ours am: 8b81a28364 -s ours am: f8855596aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0d1b5d0bfd3b7505ae6181913a7145cfae7aa896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:57:54 +00:00
Bill Yi
939cde7403 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8c0d18ada4 -s ours am: 7034e737b6 -s ours am: 5a078b4970 -s ours am: b84b97b153 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0c1da35aaa1b773c3dbed47d9a25b8ff1dd51e69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:57:24 +00:00
Automerger Merge Worker
640611b924 Merge changes from topic "am-96db44aa4dfa4e4485d74486d8ea6f46" into tm-d1-dev-plus-aosp am: 9414c443d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18099393

Change-Id: I588fd76869f069993e9d28cdd4b91459bed02c35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:48:14 +00:00
Bill Yi
f1b4c2ac06 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9349330a1f -s ours am: 6b59002229 -s ours am: 799c8e2d7e -s ours am: aa298f73f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44dc5a66dfba81ea30a8f0800376456db5fbec7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:47:59 +00:00
Bill Yi
b2579c483d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9349330a1f -s ours am: 6b59002229 -s ours am: 467d913a6a -s ours am: 5970cabb76 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5a318397ad7f4d5280e3e585ba32228e25411d3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:43:10 +00:00
Bill Yi
884ec31b20 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106 -s ours am: da1aaa3069 -s ours am: 71fc7ec758 -s ours am: 670172f665 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad427f8cc9ea21a1b9780bd0e41ca8487e958f17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:42:56 +00:00
Automerger Merge Worker
9957c467e2 Merge changes from topic "am-9fa7d80b21934066ba9777d72c99d3a2" into tm-d1-dev-plus-aosp am: 4491a88ed8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: I0251e4d22d27a0d7ca13af5fef526c26ac89f921
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:37:59 +00:00
Bill Yi
58e97a4746 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0 am: c50bf31396 -s ours am: 58da6d7afd -s ours am: a2943f2e3a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6b69b8be195f75e9defb43a1529ffd56d531a302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:37:56 +00:00
Bill Yi
566baad6bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9349330a1f -s ours am: 6b59002229 -s ours am: 799c8e2d7e -s ours am: b506123bad -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I81dbe4b92966d85bb00edf9d51f234cab64d6332
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:31:18 +00:00
Bill Yi
224cea2d4f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106 -s ours am: da1aaa3069 -s ours am: 7463359b05 -s ours am: 649022d0f9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I775455c93abc0719c7b759fbc8e9ea72971b097a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:31:05 +00:00
Bill Yi
621712f1a2 Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf am: b8f6039a2a am: b76604c461 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: I1457c726f025dc057638d81fc8276cba601d0091
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:28:45 +00:00
Bill Yi
cb97a038c6 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0 am: c50bf31396 -s ours am: d7503db15f -s ours am: ae99e62db9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I00c79841ef5438b9f64918f2b065ffc4f6bdbf49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:28:37 +00:00
Bill Yi
6f2c137f85 Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf am: a467f9dcba am: 4872c85344 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: I8e5dc7a789817969e32d5b0bdb5eb262a7ae9f5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:26:43 +00:00
Bill Yi
ad7dda471e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0 am: c50bf31396 -s ours am: 58da6d7afd -s ours am: 8cd5792307 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I21e9bdbfdda5cf195e809a3a3eae22487eabcefc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 18:26:41 +00:00