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

105942 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
changbetty
012527b81c Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT 
Bug: 214338905
Test: Manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=QrCameraTest
Change-Id: I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427
Merged-In: I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427
 2022-05-27 04:05:44 +00:00
Chaohui Wang
c2dacf1b75 Fix flicker for AppDataUsage when zero usage 
When the page is entered from the AppInfoDashboardFragment, there is no
way to know whether the cycle data is available before finished the
async loading. If it's zero usage, the cycle spinner will be removed,
which cause a flicker.

Temporarily disable the preference list's animator before initial
page updates can solve this issue.

This also fix another flicker on this page when the background data is
off.

Fix: 233963355
Test: manual visual test
Change-Id: I795ed95e15bb3216fa17adfd4f57faf5fd92fa00
 2022-05-27 10:21:17 +08:00
Bill Yi
ff457d8594 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib80c2408db28e4aa45a04109220fc2419fa82a5b
 2022-05-26 18:27:20 -07:00
Bill Yi
4fcb08305a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3fa9ddd1fa5829250d7c4fe695278c383c5c91ea
 2022-05-26 18:23:46 -07:00
Amy Hsu
f120b2ef67 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: eca20b0820 am: 2897d2fa42 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603826

Change-Id: I8835f94dceded1d6f17131264e8555fe7bf684f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 00:53:41 +00:00
Amy Hsu
bfaf38ccb9 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: eca20b0820 am: 7af580d08b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603826

Change-Id: I8baddc41e02614de807e48614c06d6d862cf6dea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 00:53:24 +00:00
Amy Hsu
2897d2fa42 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: eca20b0820 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603826

Change-Id: Id18e737daee4dd59b79662ac1b23ca114e0af275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 00:39:20 +00:00
Amy Hsu
7af580d08b Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: eca20b0820 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603826

Change-Id: I74384b25ead713af83acc06434d57ae3214739fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 00:39:16 +00:00
Amy Hsu
eca20b0820 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev 2022-05-27 00:17:19 +00:00
Tom Hsu
7b0a3f2080 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 90875efc90 am: 1db2f02c9e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: Icd797bfb567df5c5be7627ccdfaf6c1928cd8c45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:40:57 +00:00
Tom Hsu
8feed45265 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 806582197e am: 448ca95a7a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I59a3c4f57061b1395e24be2057747db67a59b5a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:39:35 +00:00
Tom Hsu
c421f73232 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 806582197e am: 019d251814 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I73a3179f80439761e4af8e1b637d7d9b4341e55d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:39:20 +00:00
Tom Hsu
1db2f02c9e Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 90875efc90 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I045ded0a1212e4baf53f4fd5577d072e70798387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:08:58 +00:00
Tom Hsu
448ca95a7a Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 806582197e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I5c427bb1620b6f31657524c944c0ab01fc33452a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:07:39 +00:00
Tom Hsu
019d251814 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 806582197e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I16eef92f8fca756292ebade85c71601ac273bff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:07:36 +00:00
Tom Hsu
806582197e Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I56919305722783a24bd68c0e378cc1d272a6f2aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 15:41:44 +00:00
Tom Hsu
90875efc90 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I3c6ddf5ca206114fa677a06a7086fa0eb75b0752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 15:40:10 +00:00
Tom Hsu
f6ea9c99b3 Merge "Fix wrong summary string show on the network page." into tm-dev 2022-05-26 15:06:00 +00:00
Jason Chiu
0c732f2a80 Don't start two pane for singleInstance deep links 
If the activity's launch mode is "singleInstance", it can't be embedded
in Settings since it will be created in a new task.

Bug: 229371407
Test: adb shell am start -a android.settings.NETWORK_OPERATOR_SETTINGS
Change-Id: I1689d860151182cd9e97d9e4fd65d30a8804a570
 2022-05-26 17:47:18 +08:00
tom hsu
d793e9512d Fix wrong summary string show on the network page. 
Bug: 206742805
Test: local test, see b/206742805#4
Change-Id: I4fa9468e4f3b7d3671e383d3203b67636daa416c
 2022-05-26 17:41:13 +08:00
Chaohui Wang
3a99f7c370 Fix flicker for AppDataUsagePreference 
AppDataUsagePreference's title is sometime async loading, which cause
preference height change, which lead to page flicker.

Set a title placeholder before async loading to reduce flicker.

Fix: 187019210
Test: manual visual test
Change-Id: I26df832ab03a04641fd3d6eb678903ff3fe8820a
 2022-05-26 17:36:45 +08:00
Xupei Li
05301c7d1a Settings: Change array resource sim_color_light to an integer array 
* It should be an integer array because its items are all color reference, and I found that the translations of this resource can lead to not show SIM color in languages other than English.

Change-Id: I6264abdfd0a49119e0170ae5c4bec437ad4c9e8f
 2022-05-26 07:17:58 +00:00
Hank Sheng
bdda48ebe5 Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4. 
screen shot:
https://hsv.googleplex.com/5487921525161984
https://hsv.googleplex.com/4853914928152576
https://hsv.googleplex.com/6492643191160832
https://hsv.googleplex.com/5915886260060160
https://hsv.googleplex.com/6321050657751040
https://hsv.googleplex.com/6222016362315776

Bug: 233036258
Bug: 233032365
Change-Id: If2bb4a82912bfdd18dc17ced11adc59eaf474bed
 2022-05-26 07:17:36 +00:00
Amy Hsu
ea858a6afc [ScreenResolutionController] UI string update 
Bug: b/230626771
Test: Check the string manually
Change-Id: Ic5c8ed146297bf1672e18e078aa8389738584cfb
 2022-05-26 11:33:52 +08:00
SongFerngWang
948f512098 Changing the condition since the esim may be removable 
The condition whether the slot is esim slot should use getIsEuicc
api since the esim may be removable.

Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: I47dc068e57a0faa7f7ce85af7933a48caa2c93e4
 2022-05-26 10:54:39 +08:00
Automerger Merge Worker
b81192f261 Merge changes from topic "am-b26f2cb44c53490f868637cd5d96ec61" into tm-d1-dev-plus-aosp am: 9c9743a464 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095

Change-Id: Icae4749c2f427be2d2021f6bf91666e3f383fe5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:15:03 +00:00
Bill Yi
83f7a4775c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 6096b86e1a -s ours am: 2366eddc23 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8874e336869963ed7df2f809f7b7abcb1d88cd5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:14:46 +00:00
Automerger Merge Worker
35b5383b73 Merge changes from topic "am-1f81d4e1bbf440c4b1a2b336aefd3506" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 6096b86e1a -s ours am: e75601afb3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours am: c99eb87613 -s ours am: 02cc0fd744 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours am: f344101fdb -s ours am: 760d7ac4f9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb -s ours am: 9b4e0f0e67 -s ours am: c43c833edf -s ours
 2022-05-25 20:13:08 +00:00
Bill Yi
bcb0120461 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 7cbd699752 -s ours am: 39208432c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id96e98dacec28faa26423f50090a26f5c2d47f0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:11:38 +00:00
Bill Yi
8b5d3ce26d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours am: 142b69b865 -s ours am: 8c834259b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4968ce85dee29dfc15e3ce95e83ca9fcf5fa8487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:11:29 +00:00
Bill Yi
58114edf1c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours am: d3f6a2192f -s ours am: 5ad0301bbe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibdbb8911a9c51f902c73525a7d269693827fb044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:11:14 +00:00
Bill Yi
c8733029be [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb -s ours am: a34af9b081 -s ours am: 6ea19fdbb7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I100af5841f318de3facae67f92e75e2807a8b1f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:11:01 +00:00
Bill Yi
84f44060f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 6096b86e1a -s ours am: e75601afb3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I046dcbb1bab517744e8f9055a4df8d5c0aeb6b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:10:56 +00:00
Bill Yi
fea99348e5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours am: c99eb87613 -s ours am: 02cc0fd744 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If0a8ed8542da07c974a802d45d04e1c248cecc94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:10:49 +00:00
Bill Yi
b7826379d5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours am: f344101fdb -s ours am: 760d7ac4f9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I251762dc4bb76486732eeb235008da638b6a9253
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:10:37 +00:00
Bill Yi
53a7d4e8dc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb -s ours am: 9b4e0f0e67 -s ours am: c43c833edf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I995bdf5371d1bb060bacb9cb7710850c2c473903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:10:19 +00:00
Automerger Merge Worker
9c9743a464 Merge changes from topic "am-b26f2cb44c53490f868637cd5d96ec61" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 6096b86e1a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours am: c99eb87613 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours am: f344101fdb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb -s ours am: 9b4e0f0e67 -s ours
 2022-05-25 19:42:31 +00:00
Bill Yi
2366eddc23 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 6096b86e1a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icaa1f51c35fe27d1ed726f0802626fd4b38506be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 19:41:26 +00:00
Bill Yi
39208432c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 7cbd699752 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iadc2b45a431c1499cfc943cc857db724a19e7475
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 19:41:22 +00:00
Bill Yi
76edd87fdc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours am: c99eb87613 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8a7f970657f3fef91be916632f5f2f587ddce09f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 19:41:20 +00:00
Bill Yi
8c834259b1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours am: 142b69b865 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5cad8be02796e43c1de7871986d76a689aa44c3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 19:41:14 +00:00
Bill Yi
ef3cb063fa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours am: f344101fdb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ef436fe88994dc48a334df7c7482e1311bc7db3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 19:41:06 +00:00
Bill Yi
e75601afb3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 6096b86e1a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6044a0d84d82198846a20eb10033f221bc2a2a4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 19:41:02 +00:00
Bill Yi
5ad0301bbe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours am: d3f6a2192f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f68df574588c168b697e0e3b9b241fc97dac49f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 19:41:01 +00:00
Bill Yi
02cc0fd744 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours am: c99eb87613 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id204adb945516f0b2bf9b32eef511d41f39987e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 19:40:55 +00:00
Bill Yi
acfd4d92c9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb -s ours am: 9b4e0f0e67 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib7230fd9451b056a31af46917b357d9d89669625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 19:40:48 +00:00
Bill Yi
6ea19fdbb7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb -s ours am: a34af9b081 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08a136382c3273d0039f2df0c52065a6b4ff4ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 19:40:42 +00:00
Bill Yi
760d7ac4f9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours am: f344101fdb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifbe06f18f6da7b3e12066d72f214c64e84ea33ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 19:40:41 +00:00
Bill Yi
c43c833edf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb -s ours am: 9b4e0f0e67 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8000753c531331ff9b855f211e5154c8bcd5cb26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 19:40:24 +00:00
Bill Yi
7cbd699752 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icac35db797bfdf2230c03a8c08b2bdd978fdb8f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 19:08:09 +00:00