PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
128,951 Commits 1 Branch 0 Tags
eeae540d6cd6124edfe24afa44eb0e8ad6574c0c
Commit Graph

128951 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
810659f82d Merge "Add a footer message for battery cycle count" into udc-qpr-dev 2023-05-25 05:53:19 +00:00
Chun-Ku Lin
fbadd2889f Use ResourcesUtils to get the resource from the target application. 
Bug: 284220081
Test: atest OneHandedPreferenceControllerTest
Change-Id: I25558af0c797dfc0a5fdd3cff6f1724ff18dac27
 2023-05-25 04:37:50 +00:00
Yi-Ling Chuang
20c5966bf4 Add a footer message for battery cycle count 
Bug: 276399056
Test: rebuild
Change-Id: I3aea252ace55edbde117698c17f1b4e0ab601b89
 2023-05-25 12:24:24 +08:00
tom hsu
97a1fc643e [Settings] Use background thread to get VoNr state. 
- TelephonyManager#isVoNrEnabled may not send back the result in time,
   so use different thread and timer to prevent ANR.

Bug: 282876876
Test: atest passed
Change-Id: Ie6cc0f8a459f5ebed930e457dacb9b742df70fad
 2023-05-25 10:56:03 +08:00
Diya Bera
ddd8bd0ed7 Fingerprint Error Dialog am: 71dd391e4d am: 565ce9eaae am: 573a59f8d0 am: d740dc9d66 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: Ib84cd36b1d64c939e91b4b5be711f0605dcc5f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 22:50:57 +00:00
Diya Bera
34ca84a805 Fingerprint Error Dialog am: 71dd391e4d am: 87cba95c68 am: e204664790 am: 0e03a069f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: Ia56773e1aea8337a647ec22d4d704ffb3755afda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 22:36:07 +00:00
Diya Bera
0abed0cd08 Fingerprint Error Dialog am: 71dd391e4d am: 565ce9eaae am: f868f3fdda am: e196e903b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: If75f48c1a672ad1eb127a574f320b4a95e13be81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 22:30:25 +00:00
Chun-Ku Lin
9849bce398 Merge "Unified service and shortcut state summary on a11y settings page." 2023-05-24 22:21:26 +00:00
Diya Bera
d740dc9d66 Fingerprint Error Dialog am: 71dd391e4d am: 565ce9eaae am: 573a59f8d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: I90dae0854c194b8cfbbf4dc1754c87cc602a86a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 21:46:58 +00:00
Diya Bera
0e03a069f7 Fingerprint Error Dialog am: 71dd391e4d am: 87cba95c68 am: e204664790 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: Ie323538a81480049def27d3317a92ec130fe81ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 21:23:47 +00:00
Diya Bera
e196e903b3 Fingerprint Error Dialog am: 71dd391e4d am: 565ce9eaae am: f868f3fdda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: Ic2e7cbf81d6893d3a6f921c808374e4327718ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 21:22:03 +00:00
Diya Bera
e204664790 Fingerprint Error Dialog am: 71dd391e4d am: 87cba95c68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: I9a0be0d0788e3bba3329074d5f97334c4aa0ba1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:59:26 +00:00
Diya Bera
573a59f8d0 Fingerprint Error Dialog am: 71dd391e4d am: 565ce9eaae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: Ia96b5aa1a9cd700b15ddf9aa986856ff4aee5f83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:59:04 +00:00
Diya Bera
6c57a7ab4f Fingerprint Error Dialog am: 71dd391e4d am: 3926ee9543 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: I905be42814e8db90eddaac4c3a8be881a92cca17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:57:30 +00:00
Diya Bera
f868f3fdda Fingerprint Error Dialog am: 71dd391e4d am: 565ce9eaae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: Iea6e58fda55aadc31aef0aca6736f874e9c9ed1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:56:45 +00:00
Bill Yi
5afbdbdb1c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: dc4c6cf07c -s ours am: ae5e86f283 -s ours am: f3c68e300f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a07d089fd7222d3f2c814af8fb0e4f2aaeeb7b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:30:52 +00:00
Bill Yi
0ad5647b3b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26b373a3e4 -s ours am: 2affec9bb9 -s ours am: 4e2592b4f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I06f48d30e48e38acb8a747f0da527c927dbf4c4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:30:48 +00:00
Bill Yi
2d0fcb971b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5ee6cbb95c -s ours am: f8bc9d8d44 -s ours am: 2041b90637 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I30fe5c52002a81f562692e77bccad9d8b1ce62a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:30:43 +00:00
Bill Yi
d081a91234 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 853e7ddba0 -s ours am: 85cad646c1 -s ours am: 63b9f34873 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iab2377585ecc6329cc9e46a4a1179be9a9c1cf05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:30:09 +00:00
Bill Yi
968ac6f643 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 62106c3d13 -s ours am: 8fd4e1cc3e -s ours am: 1fda5b526f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3ee210dd63154de09264959d27a86c74e7138ef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:29:46 +00:00
Bill Yi
f632feb258 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11ab2c74b9 -s ours am: 7af5bff35e -s ours am: 77be6c4eea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1e0d5d6d86a075424cfe0254e978a7ebe7e44dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:29:26 +00:00
Bill Yi
d61ced8b8e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: dc4c6cf07c -s ours am: 57f926c95d -s ours am: 378937dd4b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9fa8c5d1c19c3430bf253fc3a08cd0e0cd1adcfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:25:03 +00:00
Bill Yi
e4dc2a437d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26b373a3e4 -s ours am: b531e765fb -s ours am: f96b2f4688 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice52c2ba20baf6896de3855d65ec23a5768edee5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:24:58 +00:00
Bill Yi
6eb775b32b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5ee6cbb95c -s ours am: 9ed3697c68 -s ours am: 9d96de691b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8a13c68df530d4bb9233179dba75361e88aad07a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:24:53 +00:00
Bill Yi
fa50224a31 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 853e7ddba0 -s ours am: bc52047a0d -s ours am: 6520274437 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia886a4417b79cb477805f85484969f3d43598cea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:24:21 +00:00
Bill Yi
b85f453b45 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 62106c3d13 -s ours am: d54daa1c26 -s ours am: 4a00be5d4b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaaedba196fb9b041a48d9af1301845682f56f5c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:23:57 +00:00
Bill Yi
86f16fe46e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11ab2c74b9 -s ours am: d9d4ed48e7 -s ours am: 7c529a17f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2f8dd66bab0c819ebec01c32d47e7f6a14e740f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:23:37 +00:00
SongFerng Wang
a2b970c819 Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev am: 71a5715e3e am: 535a91afff am: 40a0d96640 am: da3456772d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405361

Change-Id: I5b027c5c05ab5429565ccc4dcc9d385f08828ecc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:19:21 +00:00
SongFerng Wang
c13113993f Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev am: 71a5715e3e am: 535a91afff am: 19b516807e am: 9f7ec71ed6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405361

Change-Id: Ie14f08c84696687d5f54f2978150d68c3f648827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:19:12 +00:00
Treehugger Robot
2ab5ec7fc0 Merge "Owners updates" am: b2b16851ef am: 340fde1f0f am: b41ce7e248 am: 3b3b66ec0e am: c7d954bff8 am: 821ab78c7c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601706

Change-Id: Ibd0c3bcfc349b0b0b20874a0b35eadf90284b703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:19:03 +00:00
SongFerng Wang
b3dea81ba5 Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev am: 71a5715e3e am: 75dd8a0a91 am: 29c01f1357 am: 0d3213f78d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405361

Change-Id: Ia71aeb1892bb746578c35e6878339eabcb7e24c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:18:52 +00:00
Jason Hsu
dd885a147f Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev am: fe00702ab3 am: 8d3885408e am: 4cf40a5c0b am: 731dd589fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382078

Change-Id: I9a207fbe9dcd8e0fcca2b9959278a268bb61f10a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:18:43 +00:00
Jason Hsu
ec4d28ae1c Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev am: fe00702ab3 am: cdba87523d am: e3b14146cf am: d1d2be574a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382078

Change-Id: Ief3f615d613cd3b85f72aa1ff4cb89fd3d7bc9ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:18:34 +00:00
Jason Hsu
04ae753ecc Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev am: fe00702ab3 am: 8d3885408e am: 1a0508c538 am: f722b86318 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382078

Change-Id: I90da9f74d987a49e6c31238656f7d9a1a1105b2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:18:25 +00:00
Yi-Ling Chuang
b2a488ff78 Merge "Refactor battery related feature provider" into udc-qpr-dev am: 75af9aa3f5 am: 9736f648de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382081

Change-Id: If741f7c37358727bcacf0b880548c28aecaf5f91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:18:13 +00:00
Treehugger Robot
62333c5590 Merge "Owners updates" am: 21bc49159a am: e638ec642f am: d0af78bc76 am: a0a0b501ce am: 29fce86c74 am: 198669855f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601705

Change-Id: I5d2e5848423eaa2317569f52cf9513e3b47f9c63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:16:31 +00:00
Diya Bera
87cba95c68 Fingerprint Error Dialog am: 71dd391e4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: Idf0e083fe7702e63ce899f6976c7c713be2078b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:15:48 +00:00
Diya Bera
3926ee9543 Fingerprint Error Dialog am: 71dd391e4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: I15931c21949096cffb8259fe2d4bd3c0a26ea746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:15:05 +00:00
Diya Bera
565ce9eaae Fingerprint Error Dialog am: 71dd391e4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: I614f3cbc3845d463c83605bb62c007180408834d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 20:14:53 +00:00
Bill Yi
312a8e897f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f -s ours am: 128036a053 -s ours am: 0714fceee2 -s ours am: c34cee7c73 -s ours am: 00ceb6bd85 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d98773c4e2725c6393093d01eaa32de43743743
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 19:45:13 +00:00
Bill Yi
c585b01643 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b -s ours am: affa411d4e -s ours am: 7389f5fc2b -s ours am: 965aa2c306 -s ours am: f1a74c3cfd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I971aabed594eed0dfbfe72e43a60a625bd0d34fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 19:45:09 +00:00
Bill Yi
4368250d7a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f -s ours am: 128036a053 -s ours am: 30884de198 -s ours am: 4b4a28ef4a -s ours am: 226288cf2f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4e58b288af3e00c01bd4d964727f7fff702de51a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 19:44:36 +00:00
Bill Yi
54cce31c54 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b -s ours am: affa411d4e -s ours am: 79b4a2bfe0 -s ours am: 51482e5650 -s ours am: 0b927812f7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec8c2b31112476265557eab768a291df13f0c76d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 19:44:31 +00:00
Bill Yi
80b71ea0af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f -s ours am: 128036a053 -s ours am: 0714fceee2 -s ours am: 8b8f302554 -s ours am: e90b75b012 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5b21098e6a6508b76fe2e9db3ed33ca7ede5624e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 19:43:49 +00:00
Bill Yi
00a714b4ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b -s ours am: affa411d4e -s ours am: 7389f5fc2b -s ours am: 3c5a358987 -s ours am: 8ecef370bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I77aebefa0a0a5176ab925de63a3a5a385ac49722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 19:43:44 +00:00
Daniel Huang
39d18b4fb6 Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd am: 35d25a92d1 am: e72e0efb06 am: 0add67a3fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079

Change-Id: Id94284c87fdbc6444c13d87a2565f4e5dba8af0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 19:42:24 +00:00
Daniel Huang
607ec8615c Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd am: dd8283f708 am: 56ca06b8c5 am: 4d3e45b14b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079

Change-Id: I052398256c4757ea7f075244c20154263ca21ccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 19:42:16 +00:00
Daniel Huang
166ff82c21 Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd am: 35d25a92d1 am: 1dd13430cc am: 392bf8cc1c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079

Change-Id: I51d171c501bbaef52ef09831748c098098e4cd3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 19:42:00 +00:00
Bill Yi
228e459794 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -s ours am: 0fd5495eff -s ours am: 16b592fb33 -s ours am: 73a02b6b63 -s ours am: da001b042c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib1b22537ceae3fdf1291ab33f8ecc09d152e047e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 19:08:40 +00:00
Bill Yi
98e513dac3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -s ours am: 2ab5a7908f -s ours am: 5c826f73d1 -s ours am: efbd369d04 -s ours am: a58f127b31 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I143a26ee93b6cac6e6512d670f71051968019bb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 19:08:18 +00:00