PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,137 Commits 1 Branch 0 Tags
e1f877e7a6ea22b7e29e84b18adb7927cd19f41c
Commit Graph

110137 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cole Faust
ad66ad55ca Fix ExtraText lint errors 
Android lint is being updated, and now
checks for extra text in android manifest
and resource xml files.

Bug: 236431222
Test: Presubmits
Change-Id: Ia74638562af2ba068546cb3c994e1f7f784cf663
 2022-06-29 12:20:39 -07:00
Joshua McCloskey
69cc573b76 Add field to control margin in FaceEnrollIntro 
Problem -> The require scroll mixin seems to scroll an entire device
length when a button click occurs. If you have page content
of 2x device_length + 10 pixels, a user will have to press the more
button twice to scroll this length. With the illustration_margin_bottom
field, devices can tune this parameter to allow the user to press
the more button once.

Fixes: 237474002
Test: Manual.
Change-Id: I9de2d74608260fe835870211a07b96249a8598f8
 2022-06-29 19:07:44 +00:00
Joshua Mccloskey
cbb99980b3 Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc am: 70a6062446 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093051

Change-Id: Iab2bb36460d7ba8b284fb0050a62e0918954e368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 17:37:57 +00:00
Joshua Mccloskey
54b7ac755a Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc am: e30a71787e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093051

Change-Id: I80312c96248ff2231386c154ebe0f9bf54ae4f34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 17:37:37 +00:00
Joshua Mccloskey
70a6062446 Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093051

Change-Id: If3bf0ca501d6a5bb460fa0ab05ae39239f34720e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 17:12:08 +00:00
Joshua Mccloskey
e30a71787e Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093051

Change-Id: I4574d7014cfb6ca9050428e451654b9e8002995b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 17:12:05 +00:00
Joshua Mccloskey
431542dddc Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev 2022-06-29 16:48:53 +00:00
Xin Li
b8d6e73355 Merge tm-dev-plus-aosp-without-vendor@8763363 
Bug: 236760014
Merged-In: Ifcb9d4c564839199d998bd503f390f021c6bf3ad
Change-Id: I9d69bcbc6916176beece2616f152ebd3d74fc0f8
 2022-06-28 21:23:28 +00:00
Joshua McCloskey
cdb654f9be Fixed unicorn multi-enrollment flow. 
Test: Verified that Unicorn SUW flows can now
enroll a face.
Test: Verified normal SUW flow works as expected.

Fixes: 237088482
Fixes: 234663447
Change-Id: I9c4100f61b5e7d40fc9ed67c6918ec7bf31fc30a
 2022-06-28 17:08:40 +00:00
SongFerng Wang
84c0900c8a [automerger skipped] Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" am: e27d1790f8 am: 2225b7058b am: f0973dfa33 -s ours am: 96aca02753 -s ours 
am skip reason: Merged-In Idb746e42480f99846efb5d1e4d4a411a5a9ca296 with SHA-1 cefad1e4b7 is already in history

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

Change-Id: I3d6d8cfe7f6412b84a98f6edb3b3f7a2fdec7f58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 12:24:51 +00:00
SongFerngWang
85bda3b09f [automerger skipped] The UI only shows the active LE device am: 7f6fcce1d5 am: 787a0e0249 am: 7c173b36f8 -s ours am: 9f1ce23550 -s ours 
am skip reason: Merged-In Iac661206def4d43bc40ab9bb1938f084926899c2 with SHA-1 6426382e90 is already in history

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

Change-Id: I87493c9cd5c65b40d1cddf6da98ab0c946b0d7ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 12:24:47 +00:00
SongFerng Wang
96aca02753 [automerger skipped] Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" am: e27d1790f8 am: 2225b7058b am: f0973dfa33 -s ours 
am skip reason: Merged-In Idb746e42480f99846efb5d1e4d4a411a5a9ca296 with SHA-1 cefad1e4b7 is already in history

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

Change-Id: I7fe8794b536147a489e9689fb174d9435695703f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 12:08:51 +00:00
SongFerngWang
9f1ce23550 [automerger skipped] The UI only shows the active LE device am: 7f6fcce1d5 am: 787a0e0249 am: 7c173b36f8 -s ours 
am skip reason: Merged-In Iac661206def4d43bc40ab9bb1938f084926899c2 with SHA-1 6426382e90 is already in history

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

Change-Id: I59e3dc774cd97748239407b1f89374dfd09e9827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 12:08:47 +00:00
SongFerng Wang
f0973dfa33 Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" am: e27d1790f8 am: 2225b7058b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138453

Change-Id: Iecbe5647bbe469a0239b594692f66c0226e16df8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 11:45:09 +00:00
SongFerngWang
7c173b36f8 The UI only shows the active LE device am: 7f6fcce1d5 am: 787a0e0249 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138452

Change-Id: I6e57db85b4d10586d111e39dcd7ee77e67fd9d74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 11:45:05 +00:00
Amy Hsu
c013013dfc Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev am: d5279ceae3 am: 414d2bf243 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18800521

Change-Id: I6301ed46ad49e77164eada14ff50cb4916c9eb19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 11:24:39 +00:00
Amy Hsu
2ecdab0154 Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev am: d5279ceae3 am: 6de8a405d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18800521

Change-Id: I6c0d60693e62bf0fbed8f58ee5571dcf2702638f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 11:24:19 +00:00
SongFerng Wang
2225b7058b Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" am: e27d1790f8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138453

Change-Id: I45a7c8fd77798a873db7ea10683b861ee83b8622
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 10:10:23 +00:00
SongFerngWang
787a0e0249 The UI only shows the active LE device am: 7f6fcce1d5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138452

Change-Id: I19dc6c505e7ec9824cf520824ea1ed2d9dcfc196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 10:10:22 +00:00
Amy Hsu
414d2bf243 Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev am: d5279ceae3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18800521

Change-Id: I7adc73353a1674fd950ef211cedc857da1d235c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 09:35:42 +00:00
Amy Hsu
6de8a405d7 Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev am: d5279ceae3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18800521

Change-Id: Ia2572f07b47813095947d15d4665a378c1756f18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 09:35:41 +00:00
SongFerng Wang
e27d1790f8 Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" 
* changes:
  Fix the testcase error
  The UI only shows the active LE device
 2022-06-28 09:27:02 +00:00
Amy Hsu
d5279ceae3 Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev 2022-06-28 09:09:23 +00:00
SongFerngWang
30a312975c Fix the testcase error 
The BluetoothDeviceUdater added the checking whether the item is in the
list. It caused this testcase failed.
Add more mocks for this testcase.

Bug: 237223797
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDevicesSliceTest
Change-Id: Idb746e42480f99846efb5d1e4d4a411a5a9ca296
Merged-In: Idb746e42480f99846efb5d1e4d4a411a5a9ca296
 2022-06-28 15:18:39 +08:00
SongFerngWang
7f6fcce1d5 The UI only shows the active LE device 
At the media device, it only shows the active LE device which is
connected.

Bug: 232892046
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=SavedBluetoothDeviceUpdaterTest

Change-Id: Iac661206def4d43bc40ab9bb1938f084926899c2
Merged-In: Iac661206def4d43bc40ab9bb1938f084926899c2
 2022-06-28 15:03:07 +08:00
SongFerng Wang
87b049196b Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9 am: 2bcd1f3897 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766

Change-Id: If8ec1bb3d52f4254a46d9d21e31ec1a9372978a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 06:36:09 +00:00
SongFerng Wang
8a00f325f4 Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9 am: c150fe528d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766

Change-Id: Icfcdf386740d4ad79d45923a9a0fce5c4306a5e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 06:35:52 +00:00
SongFerng Wang
2bcd1f3897 Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766

Change-Id: Ic44ab60d81ed96478ace362f50df8919fcfa52cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 06:20:38 +00:00
SongFerng Wang
c150fe528d Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766

Change-Id: I2e79ea4100840627a21bd8797c9f1875b09c9161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 06:20:37 +00:00
SongFerng Wang
602fe375d9 Merge "Fix the testcase error" into tm-d1-dev 2022-06-28 05:57:21 +00:00
SongFerng Wang
b1180d259f Merge "The UI only shows the active LE device" into tm-d1-dev am: dc72a4a14f am: 7b3320804e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910989

Change-Id: I3f6baf8c93cc362f6040f068ceb249591a83f58d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 20:05:18 +00:00
TreeHugger Robot
1f909f731d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 91d1b5cc61 -s ours am: 3c670f625b -s ours am: 2ff94793bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0feb1fce5b63b98a9ac4228d7cf32dfcefa5b365
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 19:53:21 +00:00
Bill Yi
a17a95b586 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 07bfd0bbd9 -s ours am: 1b6e655273 -s ours am: 49301ea290 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iba7eaeb887cd7b061e5d308baceae4dda40af55f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 19:53:09 +00:00
TreeHugger Robot
48928b9b27 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8b49ce00c2 -s ours am: 70e38435d3 -s ours am: a401e8ac3b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id58b3e27a3d5f9414636fd9fbd6c8574aeea5b97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 19:52:57 +00:00
Bill Yi
59fd3438f5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b070ddda17 -s ours am: e780500266 -s ours am: 5a73a597b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic75b6c119089589ff10005b756af5de402fdb6c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 19:52:47 +00:00
TreeHugger Robot
35ea0b31a9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 91d1b5cc61 -s ours am: d1ff298845 -s ours am: 78bbedd0ed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic71f887be5786242a16af08d88b8da278bdb11ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 19:50:50 +00:00
Bill Yi
6be7aafb50 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 07bfd0bbd9 -s ours am: 0a28003111 -s ours am: 2639731d35 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I88e551bb0c8ea0bbf2996e4d3ca1697d0d5e2ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 19:50:44 +00:00
TreeHugger Robot
31a3c96261 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8b49ce00c2 -s ours am: 83d410a6de -s ours am: bf69f2e66c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0b680aed0d9f0984f9bdbc26ecf2ae86cbad31b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 19:50:31 +00:00
Bill Yi
a60e8e9597 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b070ddda17 -s ours am: 9dbc2805b8 -s ours am: 54a69e25e9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I975a317f8bb6b20ad1f3ebafa74c939767fe4c8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 19:50:16 +00:00
Amy Hsu
088a212a35 [RRS] Avoid the resolution switch too rapidly. 
Make sure previous setting has been completed before we set current
resolution. Register a display listner to listen onDisplayChanged
callback. So that we can know when display resolution change completed.

Bug: 232440665
Test: Switch resolution quickly and check display situation.
Change-Id: I1460c1db191250d8e51dd639cd969e4323f71abd
 2022-06-28 01:41:24 +08:00
SongFerngWang
cefad1e4b7 Fix the testcase error 
The BluetoothDeviceUdater added the checking whether the item is in the
list. It caused this testcase failed.
Add more mocks for this testcase.

Bug: 237223797
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDevicesSliceTest
Change-Id: Idb746e42480f99846efb5d1e4d4a411a5a9ca296
 2022-06-27 20:42:31 +08:00
SongFerng Wang
6293d2a103 Merge "The UI only shows the active LE device" into tm-d1-dev am: dc72a4a14f am: 0018589f09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910989

Change-Id: Ifb31acb46471b17244ad806986be4ba6c0bed56b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-26 17:24:01 +00:00
SongFerng Wang
7b3320804e Merge "The UI only shows the active LE device" into tm-d1-dev am: dc72a4a14f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910989

Change-Id: I8aa0a982af28ba1a4f8386027ce0382d6b582bbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-26 17:02:19 +00:00
SongFerng Wang
0018589f09 Merge "The UI only shows the active LE device" into tm-d1-dev am: dc72a4a14f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910989

Change-Id: I43380dd3e84f63925c494038f9bb1c84207f2faa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-26 17:02:16 +00:00
SongFerng Wang
dc72a4a14f Merge "The UI only shows the active LE device" into tm-d1-dev 2022-06-26 16:38:24 +00:00
Jason Chiu
846d0286a8 [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow 
Deep links on large screen devices starts a homepage activity on the
left pane, and then starts the target activity on the right pane. This
flow overrides the calling package, and the target activity can't know
who initially calls it.

Thus, we store the initial calling package in the intent, so the
Connected devices page is able to make bluetooth not discoverable when
it's called from unintended apps on large screen devices.

Bug: 234440688
Test: robotest, manual
Change-Id: I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7
 2022-06-24 08:21:34 +00:00
Jason Chiu
5df14831b8 Make bluetooth not discoverable via large screen deep link flow 
Deep links on large screen devices starts a homepage activity on the
left pane, and then starts the target activity on the right pane. This
flow overrides the calling package, and the target activity can't know
who initially calls it.

Thus, we store the initial calling package in the intent, so the
Connected devices page is able to make bluetooth not discoverable when
it's called from unintended apps on large screen devices.

Bug: 234440688
Test: robotest, manual
Change-Id: I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7
Merged-In: I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7
 2022-06-24 08:16:41 +00:00
TreeHugger Robot
257d3e0cf3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 91d1b5cc61 -s ours am: 3c670f625b -s ours am: fb2bd662ba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a430fc10469b3c252dad5b6fc1b9e4db473f7e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 07:13:18 +00:00
Bill Yi
f55406e375 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 07bfd0bbd9 -s ours am: 1b6e655273 -s ours am: 5d82388879 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I27280ef2d4242745d0faf80e3ef0d25f46f9628a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 07:13:10 +00:00
TreeHugger Robot
f990e26218 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8b49ce00c2 -s ours am: 70e38435d3 -s ours am: 0e80df376a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icf812ec9ca53840feb9e837739ab26e1f1217e2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 07:12:57 +00:00