Commit Graph

129184 Commits

Author SHA1 Message Date
Bill Yi
6520274437 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 853e7ddba0 -s ours am: bc52047a0d -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: I39a0adf6cc90fea2204c1735dc4a3f160e6d5fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:56:02 +00:00
Bill Yi
4a00be5d4b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 62106c3d13 -s ours am: d54daa1c26 -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: I5f9110e01971fabe18cff2dd0a2b836036161e5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:55:36 +00:00
Bill Yi
7c529a17f4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11ab2c74b9 -s ours am: d9d4ed48e7 -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: I296f350fe6381f636293d64a77e7863a488b569a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:55:14 +00:00
Bill Yi
ae5e86f283 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: dc4c6cf07c -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: I004622940f7cd703d8a300e5445478c33023c3f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:39:24 +00:00
Bill Yi
2affec9bb9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26b373a3e4 -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: If5c641f24bace7be5df568522e143cee790cdad7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:39:18 +00:00
Bill Yi
f8bc9d8d44 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5ee6cbb95c -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: I0b71c76b8ddaa27509076c335f3551440617cbe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:39:14 +00:00
Bill Yi
85cad646c1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 853e7ddba0 -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: Ifb4872706fa2cb3f5e5560cc202eeb1a8b82c7e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:38:40 +00:00
Bill Yi
8fd4e1cc3e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 62106c3d13 -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: I8d0f764b1d8447d6b39e1f5d9c0b6bd08dd42458
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:38:17 +00:00
Bill Yi
7af5bff35e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11ab2c74b9 -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: I74dff6cfaf6c162c1c7fa32636b23b5d74428da7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:37:58 +00:00
Bill Yi
57f926c95d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: dc4c6cf07c -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: I5e59db548a7277241a9ccaec754033b90cf954cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:36:00 +00:00
Bill Yi
b531e765fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26b373a3e4 -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: I36cb7805f09e36dd5faeef7c0def750a198a1428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:35:58 +00:00
Bill Yi
9ed3697c68 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5ee6cbb95c -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: I03ac3e0b8dd7c4a99bc9d357f23257097b081776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:35:52 +00:00
Bill Yi
bc52047a0d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 853e7ddba0 -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: I8dddffd8855e1ddd235305cb8153054fe388475f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:35:16 +00:00
Bill Yi
d54daa1c26 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 62106c3d13 -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: I5815e44184fc69caea51ebbe8944af8b4990fb75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:34:53 +00:00
Bill Yi
d9d4ed48e7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11ab2c74b9 -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: I899acc4c367de63c7d2cdc0b38c9ee17c4d22c4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:34:34 +00:00
Diya Bera
71dd391e4d Fingerprint Error Dialog
Add "Try Again" for UNABLE_TO_PROCESS error. Change default title
string. Custom strings for Settings and Setup.

Bug: 280786940
Test: Try to enroll fingerprint, trigger a corresponding error and check
the error dialog

Change-Id: I5975d169e1d33cff87f58fb8882261bb1bd3520e
2023-05-24 10:15:52 -07:00
Bill Yi
dc4c6cf07c Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-05-24 17:14:01 +00:00
Bill Yi
5ee6cbb95c Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-05-24 17:14:01 +00:00
Bill Yi
62106c3d13 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-05-24 17:14:01 +00:00
Bill Yi
156beaa5b4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -s ours am: 789290be46 -s ours am: e379726b51 -s ours am: 6b6386163e -s ours am: e54a0e6a62 -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: If7c6597934a4235f0237e5d65038189fd2cb52f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:13:54 +00:00
Bill Yi
2d07ac7638 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -s ours am: c5a289d530 -s ours am: 1187b059e5 -s ours am: a7016867de -s ours am: 3f6346370d -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: I79be10f9b5a5378aab16627fb3496efdb3b9e7b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:13:31 +00:00
Bill Yi
20ed0ab26a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -s ours am: 789290be46 -s ours am: 5a18114757 -s ours am: 8ea4882c07 -s ours am: b84c9d2576 -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: I74704ed6222ab5146a0967270277e02b44f04f92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:11:51 +00:00
Bill Yi
83356620e7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -s ours am: c5a289d530 -s ours am: 45604d8938 -s ours am: e6a8da6540 -s ours am: b8a491486e -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: Iff4039f8f671952ef1d4dee6d5c8d4e7c69b5878
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:11:29 +00:00
Bill Yi
a32be9202d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c13633d1d0 -s ours am: fa94aa39eb -s ours am: 84540eb406 -s ours am: 31ae0474ae -s ours
am skip reason: subject contains skip directive

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

Change-Id: I06b199b5075289ce41aafcae3c20edc57c43597c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:09:51 +00:00
Bill Yi
afbb66ca71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2e8c8077b -s ours am: 7e4689c960 -s ours am: da3133ac63 -s ours am: 56dc6413be -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9f797b9312cef0d3a67821901c88dd90bc1034d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:09:49 +00:00
Bill Yi
62e94da726 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 67553d6348 -s ours am: c5bca3f94f -s ours am: ad0d23056a -s ours am: 797fc344f1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I021ba3beebc1c518b1c84287a8cca89849da7e32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:09:42 +00:00
Bill Yi
5def13f041 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 197ad03f9e -s ours am: dc957a0cae -s ours am: 7c4360c9dc -s ours am: 88cdc5a2d8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5f6897f2b909e84fd6b6a3e68dc0f0bf183e55b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:09:17 +00:00
Bill Yi
1ebabbb9e9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: dd664531a5 -s ours am: 2833f69afa -s ours am: ae1eb664b7 -s ours am: e82ceae8a0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iea7945136ff49aadae7441ec8eec7c1fb02e989f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:08:54 +00:00
Bill Yi
709a9b9770 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81564a8384 -s ours am: 59aaf2dd32 -s ours am: 98d36bda87 -s ours am: ecdf2f198e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie57719bff8d172da71876b38f1c0fb9c704658fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:08:35 +00:00
Bill Yi
7beacaa47a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c13633d1d0 -s ours am: 425f03d8c2 -s ours am: 49158d6ab2 -s ours am: 6c96711315 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie3b164204c031d42783f4f850e3dbe1239e76d52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:07:09 +00:00
Bill Yi
94696fc55c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2e8c8077b -s ours am: 0ff2acd74e -s ours am: 8704f31c3e -s ours am: b8333888c0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibdd7f805a66bde72fe9c203e2f88be9d27661c7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:07:05 +00:00
Bill Yi
2576925a81 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 67553d6348 -s ours am: 851cd09273 -s ours am: b5f465a035 -s ours am: a71ca08160 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I46d7f4e452f8fa88a2e1b51c777402b478ba48d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:07:00 +00:00
Bill Yi
ac92609cfd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 197ad03f9e -s ours am: 90323d459e -s ours am: 5a8bc21cf6 -s ours am: d9c3cd288d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I218e9e8439e181924691321fbf55bd1ba20a9da9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:06:35 +00:00
Bill Yi
8227b3f13d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: dd664531a5 -s ours am: 6f9dae1c63 -s ours am: 553e0f65e2 -s ours am: 9ee59b6702 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I722e7a394b36b17f8812a262d981e853bba78eb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:06:12 +00:00
Bill Yi
c223507bf7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81564a8384 -s ours am: c02f810e09 -s ours am: 4c53bc8ff3 -s ours am: e6acd2dc6d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iae5c83a6953c3479929877c27c42785a5c275568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:05:53 +00:00
Bill Yi
1f6f50270f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c13633d1d0 -s ours am: 425f03d8c2 -s ours am: 65a298a7ab -s ours am: 2e58ab4ac2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If477bfaabd437b66f52bacbe5bfa7103d9aa3b76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:02:16 +00:00
Bill Yi
22528ba2b9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2e8c8077b -s ours am: 0ff2acd74e -s ours am: 008c248017 -s ours am: 66d7b39f2e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9eea87de9c328dc561baec4bed4ba8872758b76c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:01:53 +00:00
Bill Yi
7653b5c5b9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 67553d6348 -s ours am: 851cd09273 -s ours am: 59470b027c -s ours am: c8316d8371 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I70c987697cc53cfe60ede8f3f0d1e59eb2f93e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:01:46 +00:00
Bill Yi
dce33ce214 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 197ad03f9e -s ours am: 90323d459e -s ours am: 9abc6dfab9 -s ours am: 3fcb054944 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I517c1699acb7c36fd6754b90c8512a60ce31959a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:01:22 +00:00
Bill Yi
82909b2377 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: dd664531a5 -s ours am: 6f9dae1c63 -s ours am: e04ac53021 -s ours am: 0629a1df0f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1f7ca07a88bd70e488f71fe601a1cdd611a159c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:00:59 +00:00
Bill Yi
6f52f43418 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81564a8384 -s ours am: c02f810e09 -s ours am: 1eac4d3913 -s ours am: 76794bcf9e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4694a6d6c2e3b4824a1848ff2db7beb7c0539396
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:00:39 +00:00
Bill Yi
5e1aba4064 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 29ffda8638 -s ours am: 99891d9846 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8def0d1e24984f25b1d06b5482caa811ecc0127d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 16:58:21 +00:00
Bill Yi
9271440659 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 803df51b41 -s ours am: 1992683102 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic02e0345d046eebceea4eac5b69ff67acb17a030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 16:58:20 +00:00
Bill Yi
5ba254e9fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: d17812db69 -s ours am: 3d96b555c9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib50016f6ae09f8a7cb15954902643a36d4f051c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 16:58:13 +00:00
Bill Yi
cfb043164e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f1ab0d85e5 -s ours am: 47d9ede73c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib12b77032edac782104ad265fe9ff95f8e40aed8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 16:57:53 +00:00
Bill Yi
2c97864c32 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 0ab89bcac1 -s ours am: 72ede8d37d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iab4b532d033901c4fb3ae5d58dd571c887eb5728
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 16:57:29 +00:00
Bill Yi
d0a112ff47 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e27faf3b1 -s ours am: fe6cefd1a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7970760b2e962d8b0394917c4fa473b6c0676305
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 16:57:05 +00:00
Chaohui Wang
ce56dcc30b Fix crash of PictureInPicture
This follows change I3115cf1b99a305efef192a0dcf3e809eb7903d0a

PackageManager.getPackageInfoAsUser() will throw exceptions when the
package is too large which is a known issue to PackageManager but very
low priority given resourcing constraints. As per the PackageManager
team suggestion, catch the exception on the app side to alleviate the
impact to the PictureInPicture & App info page.

Fix: 283076353
Fix: 283354211
Test: Unit test
Change-Id: Iad2bf9fbfca6ee7f604fec1c4afa1b9382f6ec7e
2023-05-24 19:41:20 +08:00
SongFerng Wang
da3456772d Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev am: 71a5715e3e am: 535a91afff am: 40a0d96640
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405361

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

Change-Id: I8fce026fee3abfef29de73673946690ecf822979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 11:13:49 +00:00