PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
131,244 Commits 1 Branch 0 Tags
412fc3e2c41a1ceff6224e9613649b2f83b2a62c
Commit Graph

131244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerngWang
d7a2aa3200 To refresh/register/unregister all of the devices with same groupId am: ef7a75c394 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308381

Change-Id: Ic053e0561b48b2ada6f2a57f1c467c64e4b52379
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 10:31:45 +00:00
SongFerngWang
64281594d1 To refresh/register/unregister all of the devices with same groupId am: ef7a75c394 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308381

Change-Id: I715fcfd8d93f557a485b2caba663fd8bb40851f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 10:31:41 +00:00
SongFerngWang
be615f9351 To refresh/register/unregister all of the devices with same groupId am: ef7a75c394 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308381

Change-Id: I2b7c50fad0b06cbbe5d9417d136feb498d1f112c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 10:31:39 +00:00
Daniel Huang
e69db09a88 Merge "Use FeatureProvider to provide the firmware update category." into udc-qpr-dev 2023-05-18 10:27:54 +00:00
Allen Su
998933a44d Fix dialog disappear when screen off and on 
Bug: 248514263
Test: by manual
Change-Id: Ieac71f57b8672204dd2bc6c1c39e473d0ffa25cf
 2023-05-18 10:27:52 +00:00
danielwbhuang
6189f9fcbd Use FeatureProvider to provide the firmware update category. 
1. Add KeyboardSettingsFeatureProvider in FeatureFactory.
2. Use KeyboardSettingsFeatureProvider to add firmware update UI.

Bug: 270114180
Test: manual, atest KeyboardSettingsFeatureProviderImplTest
Change-Id: I62ec7aff71dd5c0d496860363f2c5b3e992503ff
 2023-05-18 17:24:43 +08:00
SongFerngWang
ef7a75c394 To refresh/register/unregister all of the devices with same groupId 
Since the LE audio have two or more devices in the same group and
the UI show their status at one preference, the UI need to register
callback for each of the devices, and also refresh the deviceList.

Bug: 278155752
Test: local test to pairing the device and check the battery part
Change-Id: I2fcde92a1f68b8437465b234820f7bad13dfc444
 2023-05-18 16:28:52 +08:00
Daniel Norman
30fd7076ed Merge "Hide the a11y service enable dialog from non-a11y-tools." into udc-dev am: aa46e3d39d am: 9b6494cfcb am: cd868ca92b am: 90d893695d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23267499

Change-Id: Ie00fca63d5d6f0d439204fdbebb30fd10cce46de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 05:41:30 +00:00
Daniel Norman
c148dc4acc Merge "Hide the a11y service enable dialog from non-a11y-tools." into udc-dev am: aa46e3d39d am: 5a48445bf1 am: 4557233528 am: aa44d4a7c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23267499

Change-Id: I5389bbeeeeca172478605571ec8b3ff4d4b79bed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 05:40:56 +00:00
Daniel Norman
88b2532721 Merge "Hide the a11y service enable dialog from non-a11y-tools." into udc-dev am: aa46e3d39d am: 5a48445bf1 am: d7f544572d am: 895f82f998 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23267499

Change-Id: I3b9c9040434d29e14ab51c514d695d84ce458078
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 05:40:08 +00:00
Daniel Norman
cbb2b3dcb2 Merge "Hide the a11y service enable dialog from non-a11y-tools." into udc-dev am: aa46e3d39d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23267499

Change-Id: I932d859492281a630b61b95f4b9699fcd4b00678
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 04:48:03 +00:00
Daniel Norman
90d893695d Merge "Hide the a11y service enable dialog from non-a11y-tools." into udc-dev am: aa46e3d39d am: 9b6494cfcb am: cd868ca92b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23267499

Change-Id: I6a2d80658653c9be825cb8def167bd5aaf87e8fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 04:31:24 +00:00
Treehugger Robot
36a0fd6f0a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 19935236b0 -s ours am: 2722d0887b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I97c9eca8571e3fff9e32edc19110dc500614be43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 04:31:04 +00:00
Bill Yi
540223fac6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df -s ours am: 66dc9d023f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4bdfb23e7adc34bed6e75a2ec5fc04ffed921e3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 04:30:57 +00:00
Daniel Norman
aa44d4a7c2 Merge "Hide the a11y service enable dialog from non-a11y-tools." into udc-dev am: aa46e3d39d am: 5a48445bf1 am: 4557233528 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23267499

Change-Id: I2ab993a28b1a6f3de87efcb57c3fd35a4a403de4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 04:30:16 +00:00
Daniel Norman
895f82f998 Merge "Hide the a11y service enable dialog from non-a11y-tools." into udc-dev am: aa46e3d39d am: 5a48445bf1 am: d7f544572d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23267499

Change-Id: If487f7b972427547bc3a3ca9da0c6e69e17f72db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 04:26:46 +00:00
Bill Yi
84368b0126 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: d83c9c6f21 -s ours am: f6ece5c0ab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99e76b80072cef8e009e259960e4fca32f17646a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 04:25:29 +00:00
Bill Yi
db2e64b446 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f88b1c7f59 -s ours am: 55356a71e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie4a0fa654b2b1b17fad3f8945b50faf1d21ebfc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 04:25:21 +00:00
Bill Yi
c61bbb6e74 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d69f19c92f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibd78b4463b3b51bdfdae7d8d86a852e5a6564319
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 04:18:43 +00:00
Bill Yi
9f12d14d25 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f32482d0d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibd0b9d4bbb5fae0c594b46cf02d2e7abac097347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 04:18:37 +00:00
Bill Yi
6ae0f70c42 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1e7e184419 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia9c12a823f8f0c7fc9ca8ac3bcc46f0a02ca8d36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 04:18:23 +00:00
Bill Yi
02f07913cb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0cb680936f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I61f5ae60cbf114e39bbd863f8ce6e56d057d056f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 04:17:57 +00:00
Bill Yi
5518a73305 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d4053e03a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f01fe2e43d17b637498d91e0fc1ef7b9bafe0a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 04:17:36 +00:00
Bill Yi
4b3d27162d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f83f62f608 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I40fab13bd3f62f8adda342e8678f2386771f3d27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 04:17:19 +00:00
Daniel Norman
4557233528 Merge "Hide the a11y service enable dialog from non-a11y-tools." into udc-dev am: aa46e3d39d am: 5a48445bf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23267499

Change-Id: Idad505b6d7666658282e159f38c946416135ec82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 03:39:47 +00:00
Daniel Norman
cd868ca92b Merge "Hide the a11y service enable dialog from non-a11y-tools." into udc-dev am: aa46e3d39d am: 9b6494cfcb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23267499

Change-Id: I3529eb71d47271bebf4d30837dd4802a811516aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 03:39:13 +00:00
Daniel Norman
d7f544572d Merge "Hide the a11y service enable dialog from non-a11y-tools." into udc-dev am: aa46e3d39d am: 5a48445bf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23267499

Change-Id: Idda4f7602d7bf921ed74995bb9c39f8bb3d21ac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 03:39:06 +00:00
Bill Yi
1d5ad9fe76 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ddb6d0ea0a -s ours am: 66c4c78f51 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0736d5715b2e1a31d88f53bad6ebe2d0cabadaaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 03:37:33 +00:00
Bill Yi
2272121917 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 52b4eb39a6 -s ours am: c0267ceb73 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I175e3ab61fbbd4138be7abab58a6623921163380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 03:07:19 +00:00
Julia Tuttle
5f93d6e9fc Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254

Change-Id: I5211a87fbe5db4d2bffc1a33f2e0c9f2a0586d8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 03:06:25 +00:00
Automerger Merge Worker
0e4e904c7b Merge "Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e6904f" into udc-devicelock-prod 2023-05-18 03:06:20 +00:00
YK Hung
e2680ec5d6 Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e6904f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578

Change-Id: I8850bd93691afbd319d7baed90bf34ac01852527
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 03:05:15 +00:00
YK Hung
4cd039f04c Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e6904f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578

Change-Id: Ia54dc481f89b6dddb7c5919deee7047fbb8c2582
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 03:04:03 +00:00
Zoey Chen
180d4a281b Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700

Change-Id: I2e8b91bd13763e11cf7406923d20a6c4cfc429cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 03:03:52 +00:00
YK Hung
def5c3fbef Merge "Add protection for the BadParcelableException" into udc-dev am: 54f39ec271 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279576

Change-Id: Ic0b1e0cd1ceeea19b5539da15e189806dfe25565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 03:03:44 +00:00
Treehugger Robot
3e020bb539 Merge "Support RTL for HomepagePreference title" into udc-dev am: 01655c82ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23264119

Change-Id: If1374bfd6256cb24ecf767acd042868670e270f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 03:03:34 +00:00
Yanli Wan
ee27000bb6 Merge "Start activity from Device Lock APEX if device is provisioned by Device Lock" into udc-dev am: f5ce620937 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087508

Change-Id: I3e5aeda7846bb61b9247a912b316c337b7f3e511
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 03:03:26 +00:00
Treehugger Robot
43966321da Merge "LEA developer option is enabled if the BT LEA flag is enabled" into udc-dev am: 6814775fea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23249483

Change-Id: I583d4f4ebbc5def7790b92fe37fc1b554a72a3ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 03:03:17 +00:00
Yuxin Hu
c55d47b975 Merge "Toggle switch back when user dismisses dialog by tapping screen" into udc-dev am: 174bd2ab74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23220112

Change-Id: I99ad86400b6a3cca3edf1d2a01865a4a5bfaf377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 03:03:09 +00:00
Treehugger Robot
a13881269c Merge "Hide "Long Background Tasks" page from Settings." into udc-dev am: b272dbc613 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23252718

Change-Id: Ibe5b3660e7b06d5773bfc8df448941e539d23523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 03:02:58 +00:00
Treehugger Robot
13385202f6 Merge "Update char limit for i18n" into udc-dev am: 8545c1fab3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258701

Change-Id: I81b8d0d093059b910d2252dcd64624b2530bbf39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 03:01:52 +00:00
Avinash Vadlamudi
dc29ddf0b1 Merge "[Auto Pin Confirmation]: Increase the touch target of checkbox to 48dp for accessibility" into udc-dev am: 52cc34d370 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240820

Change-Id: I767ebd6a0a425bdca45965c5a9ecf5450e920086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 03:01:43 +00:00
Edgar Wang
15c75719bb Merge "Update theme for ChannelPanelActivity" into udc-dev am: 9b95a077b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258697

Change-Id: Idbf70e0d1b97aa18ac2da9c391c15ed68fdebf36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 03:01:36 +00:00
Treehugger Robot
cf379c4f3f Merge "Limit the optimization mode restore mechanism for specific conditions" into udc-dev am: b2de62c076 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23241740

Change-Id: I78ac48f12146668057632b1e89c3c14008034d44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 03:01:24 +00:00
Treehugger Robot
b8df6b413a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 19935236b0 -s ours am: ef7d5b407c -s ours am: e476d48fc7 -s ours am: 55601a3d22 -s ours am: 14a14c5e34 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id6b067d8581c9025afa2b0bae3cb4eda5f660481
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 02:13:54 +00:00
Bill Yi
5501da87dc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df -s ours am: 1686903bde -s ours am: bf2f91de1f -s ours am: b6ef1bcae4 -s ours am: b48f3444d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I517c544a4a18f0c53835d97d52eca7cb1c7b5dbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 02:13:50 +00:00
Treehugger Robot
fed6fe7e17 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 19935236b0 -s ours am: 2722d0887b -s ours am: fa5b9dc846 -s ours am: 4366d87cbf -s ours am: 9c3f0d9259 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0b428e82f00faacdeaed946dc02da5c1972cc2fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 02:10:50 +00:00
Bill Yi
b89cac6213 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df -s ours am: 66dc9d023f -s ours am: f24204bb1c -s ours am: 5f7c7d56ae -s ours am: fc71fae125 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44d2302a751e5d57ff1795be67245d6d86b61d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 02:10:47 +00:00
Treehugger Robot
56c5ae441f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 19935236b0 -s ours am: 2722d0887b -s ours am: ae18b5b863 -s ours am: 263049e89d -s ours am: 8c3a80939a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf1019b3f71e2058a13faf06b66f0319bed5ac13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 02:06:05 +00:00
Bill Yi
778f77c5d0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df -s ours am: 66dc9d023f -s ours am: a2a2d5875b -s ours am: 7ceb5fbbe9 -s ours am: f4a98863be -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifc96351ae02d9050d8ede7d19d74575ab729ade4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 02:06:00 +00:00