PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
132,577 Commits 1 Branch 0 Tags
2281a64085afe976faea378d5e33f0c6b7231dfc
Commit Graph

132577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chun-Wei Wang
c680da15c3 Merge "ChooseLockPattern: remove redundant setting of visible pattern default" into udc-qpr-dev 2023-07-11 03:24:17 +00:00
Jean
137cc9af68 Set the shortcut size to large when user enabled Magnification 
Set the settings shortcut size to large when the Magnification shortcut it enabled. Provide users with the large size as the default, which is easy to see.

Bug: 283844702
Test: manually - attach videos in the bug
Test: atest ToggleScreenMagnificationPreferenceFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ToggleScreenMagnificationPreferenceFragmentTest
Change-Id: I8fac5780b8388b1b4f124cffbdd305235f035e72
 2023-07-11 02:21:09 +00:00
Joshua Mccloskey
9416328ab7 [automerger skipped] Merge "Moving FingerprintSettings to Kotlin" into udc-qpr-dev-plus-aosp am: 1c7a298038 -s ours 
am skip reason: Merged-In I8eb5c30e6f2e92c256ae7c257a9d560439ba418f with SHA-1 9642d1e8cb is already in history

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

Change-Id: Icb57f324d1ca18913961c51cff8a72cdca2d179e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 19:37:27 +00:00
Joshua McCloskey
eb36bd7c34 [automerger skipped] Moving FingerprintSettings to Kotlin am: 2f46489926 -s ours 
am skip reason: Merged-In I8eb5c30e6f2e92c256ae7c257a9d560439ba418f with SHA-1 9642d1e8cb is already in history

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

Change-Id: Iac65e152e90559ff7398b3b075d057e443bba5e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 19:37:23 +00:00
Joshua Mccloskey
1c7a298038 Merge "Moving FingerprintSettings to Kotlin" into udc-qpr-dev-plus-aosp 2023-07-10 19:02:01 +00:00
Pavel Grafov
b758a84e07 Set profile pattern visibility controller in xml 
Bug: 289967858
Test: manual, with TestDPC
Change-Id: I72f271e162d468bb4cd5cfa9f23d467c4504f1e9
 2023-07-10 18:02:07 +01:00
Treehugger Robot
3365eb3e7a Merge "Improve volume slider" into main 2023-07-10 10:27:21 +00:00
Chaohui Wang
b9502d2c05 [automerger skipped] Fix crash when call getMobileTemplate am: 9132535e5e am: 1578772d63 am: 057c15c26a -s ours 
am skip reason: Merged-In I6227f973ec38e5b0520f54a41ac2ede2929a1bcc with SHA-1 77fd6aa117 is already in history

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

Change-Id: I8840616271d8d05fd60cdca24ae04acee83bae35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 09:39:22 +00:00
Chaohui Wang
b62324d39d [automerger skipped] Fix crash when call getMobileTemplate am: 9132535e5e am: f3d6684e14 am: dc3fc1dff0 -s ours 
am skip reason: Merged-In I6227f973ec38e5b0520f54a41ac2ede2929a1bcc with SHA-1 77fd6aa117 is already in history

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

Change-Id: I8ff5fa12bc170a5601964051d9d33ddbf4f491bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 09:38:41 +00:00
Daniel Huang
f57f2efef5 Merge "Add @SearchIndexable annotation." into main 2023-07-10 09:20:28 +00:00
Chaohui Wang
057c15c26a Fix crash when call getMobileTemplate am: 9132535e5e am: 1578772d63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328

Change-Id: I9d6300da831dff79e2ae605e59d3a3af41f48c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 09:02:44 +00:00
Iván Budnik
ff2fd768bc Merge "Fix adjust volume call on MediaDeviceUpdateWorker" into main 2023-07-10 09:00:17 +00:00
Chaohui Wang
dc3fc1dff0 Fix crash when call getMobileTemplate am: 9132535e5e am: f3d6684e14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328

Change-Id: Ifbeab53d402207c0cd63ab225f30af6bdc4da824
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 08:56:59 +00:00
Chaohui Wang
1578772d63 Fix crash when call getMobileTemplate am: 9132535e5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328

Change-Id: I01c40793839a7d5fbd0b7834c67184c228356c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 08:16:04 +00:00
Chaohui Wang
f3d6684e14 Fix crash when call getMobileTemplate am: 9132535e5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328

Change-Id: Ia4b74067049da536c8f98230e588b579379fdad6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 08:12:07 +00:00
danielwbhuang
4add2adf00 Add @SearchIndexable annotation. 
Settings search collects all index data through SearchIndexablesProvider.
Users can enter keywords to query these index data in Settings search.

Bug: 289967511
Test: build pass
Change-Id: Ib934becbf8bc433489ca81aea10cecbcc5584a77
 2023-07-10 15:41:14 +08:00
Zaiyue Xue
c93fe0b509 Fix testUidCache_switchLocale_shouldCleanCache in BatteryEntryTest 
Remove unused code and test

Bug: 290318160
Fix: 290318160
Test: presubmit
Change-Id: I20c612270c67f55e0b01fa849514ba670b696db3
 2023-07-10 15:06:57 +08:00
Chaohui Wang
9132535e5e Fix crash when call getMobileTemplate 
There are 2 versions of getMobileTemplate.

The previous Change I7865823d6af2c812afa35d047bd79b60ae4b0fb7 change
from the correct version to the wrong version.

Change back to fix the issue.

Fix: 290381395
Test: manual - on Mobile Settings page
Test: unit test
Change-Id: Icb3147558176d53dc77e7bd39ab54a5dad13c12b
Merged-In: I6227f973ec38e5b0520f54a41ac2ede2929a1bcc
 2023-07-10 14:20:07 +08:00
Jason Chang
c805b2e163 Merge "Fix the “screen lock option” and password restriction view are in the wrong position on PIN/Password/Pattern in the landscape mode." into udc-qpr-dev am: 5a0d4d1cc3 am: 17d1e70930 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712165

Change-Id: Ic73f5be63e2d9de3ede40fcfdb63357cab867634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 04:19:00 +00:00
Jason Chang
17d1e70930 Merge "Fix the “screen lock option” and password restriction view are in the wrong position on PIN/Password/Pattern in the landscape mode." into udc-qpr-dev am: 5a0d4d1cc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712165

Change-Id: I8c58292e2b93f0e827d059c44046002d72eb772b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 03:41:17 +00:00
Bill Yi
f7fc9d1087 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-07-10 03:27:44 +00:00
Jason Chang
5a0d4d1cc3 Merge "Fix the “screen lock option” and password restriction view are in the wrong position on PIN/Password/Pattern in the landscape mode." into udc-qpr-dev 2023-07-10 03:06:07 +00:00
Patty Huang
698ce52a17 Show LE audio toggle in Device Detail by default 
Bug: 289884263
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioDeviceDetailsPreferenceControllerTest
Test: Checks the LE Audio toggle is shown in Device Detail by default
Change-Id: I3affeebd9b2c59d24f4eaa76a1a22a714e968976
 2023-07-10 11:05:35 +08:00
Treehugger Robot
3943e14eff Merge "Fix do not disturb bypass user restriction" into main 2023-07-10 02:44:53 +00:00
Bill Yi
326807b65e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: f89feda95a -s ours am: 7e7dbde91c -s ours am: 03378d121f -s ours am: d148a02796 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib454886456991966d365c8592a031acc62a10a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:57:25 +00:00
Bill Yi
598146af20 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 5e19b2f723 -s ours am: fef711a1be -s ours am: 2e914d0f97 -s ours am: bed14260bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id3900b9291800f143ca519fa4ca633b79da99679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:57:10 +00:00
Bill Yi
ea649e658a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: d1e4580468 -s ours am: 9242c61918 -s ours am: fc779544aa -s ours am: f0e9f6102d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4337cfdf834212d9660eeb946ca6238bdb89723f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:55:51 +00:00
Bill Yi
cadb24431f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 96c5a8a5b1 -s ours am: b529ea9616 -s ours am: 5679d090e2 -s ours am: ee360ca80c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9bf9fc6c2e32882bfd2d7065a6c43a420091c8af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:55:35 +00:00
Bill Yi
c466f886e6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4c82c3ca22 -s ours am: 1e56c47970 -s ours am: 795c1d48bc -s ours am: 2c4950cb81 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I153f8d40d49cf96661b58921dddc1ce94990b6be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:52:33 +00:00
Bill Yi
e3fabde654 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b36788ee -s ours am: 133ea630cd -s ours am: d3fe40fc73 -s ours am: 67de158d99 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I484bd83f774b08efc8476b5ac260da2cd6f5baa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:52:22 +00:00
Bill Yi
f63158b32d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2653ed9e80 -s ours am: 3515338e98 -s ours am: 0569968d37 -s ours am: b61219c22f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e149c6890fdf4322c2b8e7b20eb84cc2bff5f4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:52:09 +00:00
Bill Yi
cd5054079b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a30f4c565 -s ours am: 67f2600f7d -s ours am: ab5f054b40 -s ours am: 7ab37f4a48 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2c4754e1f14264c3792b5301e68ac572c4708632
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:51:57 +00:00
Bill Yi
272479c274 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: d1e4580468 -s ours am: f111f3ebaf -s ours am: 852ae30fee -s ours am: 02e9928931 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1829a057615ea246674446ad0325c9166683e7d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:50:00 +00:00
Bill Yi
37c69f0467 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 96c5a8a5b1 -s ours am: 02a459ef67 -s ours am: c732e1f988 -s ours am: b91957c3f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I022dbd1ea699ccdec20dadf3cd9add5cc8c1d876
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:49:48 +00:00
Automerger Merge Worker
e610b4df6e Merge changes from topic "am-352985f888d641f78c6c89f939d5bd5b" into udc-qpr-dev-plus-aosp am: e766e5fd00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23940945

Change-Id: Ia57c142cd6c200843b73889a292a427b536f6c7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:48:22 +00:00
Bill Yi
f4e775f7a9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4c82c3ca22 -s ours am: 6e55d384d7 -s ours am: 3787e12f84 -s ours am: ee3c308130 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia71b45c02f942e55cdd090645e0eb3352df28300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:48:09 +00:00
Bill Yi
823ef625a4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: d1e4580468 -s ours am: f111f3ebaf -s ours am: 49364cf09e -s ours am: f780ee4889 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I33d464f6b3f639838c0bab026861f39c3850d45b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:42:05 +00:00
Bill Yi
d148a02796 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: f89feda95a -s ours am: 7e7dbde91c -s ours am: 03378d121f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4f9f1172cb7d53b381e8fe63ea4090d6c1fa4622
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:41:59 +00:00
Bill Yi
dac6fc6883 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 96c5a8a5b1 -s ours am: 02a459ef67 -s ours am: ff7929763e -s ours am: e667d7f594 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7fef906733df17f911a90021b4c275a001a22341
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:41:51 +00:00
Bill Yi
bed14260bb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 5e19b2f723 -s ours am: fef711a1be -s ours am: 2e914d0f97 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1dd6313f25fb074342731a44d3e711b06f075bc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:41:45 +00:00
Bill Yi
f0e9f6102d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: d1e4580468 -s ours am: 9242c61918 -s ours am: fc779544aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a07c8817b15adb5153bff2c20c8ea0351b2c808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:40:30 +00:00
Bill Yi
ee360ca80c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 96c5a8a5b1 -s ours am: b529ea9616 -s ours am: 5679d090e2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I46d6a6e7fef51d6487f676a9e12348d81a54a660
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:40:12 +00:00
Bill Yi
2c4950cb81 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4c82c3ca22 -s ours am: 1e56c47970 -s ours am: 795c1d48bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I12995ac38ff9f5e276008a3b930b3700908c6c44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:38:21 +00:00
Bill Yi
197565858f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4c82c3ca22 -s ours am: 6e55d384d7 -s ours am: a64570d332 -s ours am: 0ed322ed8a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id24454ea1d3fab7c5ea5bc5b6b80527207708a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:38:16 +00:00
Bill Yi
67de158d99 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b36788ee -s ours am: 133ea630cd -s ours am: d3fe40fc73 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iebdbece454fe0d5d68c56f063b4fb415e24e0857
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:38:12 +00:00
Bill Yi
61b2d80b8c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b36788ee -s ours am: 47229f8506 -s ours am: 49b3906a89 -s ours am: 642fdeedbc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I01d7d7b641ba1ef6e5282a75b90c905461055a8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:38:12 +00:00
Bill Yi
302d3d5d73 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2653ed9e80 -s ours am: 69138bb411 -s ours am: 7ab39a8004 -s ours am: 07b69bda01 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I749287435e06c5090c2ba70aea329a46721e35dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:38:02 +00:00
Bill Yi
b61219c22f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2653ed9e80 -s ours am: 3515338e98 -s ours am: 0569968d37 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia67b71092f7748a37cb154bdfe6b1ed26d8c34a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:37:58 +00:00
Bill Yi
7ab37f4a48 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a30f4c565 -s ours am: 67f2600f7d -s ours am: ab5f054b40 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I145b1578f94f580c84236cc645453bdf5669e29e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:37:44 +00:00
Bill Yi
ed94661fad [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a30f4c565 -s ours am: 8e1bdee14b -s ours am: 46814d48f9 -s ours am: f145436d12 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6423da88d09821032320af3322501af2b09eb81f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:37:37 +00:00