Commit Graph

123932 Commits

Author SHA1 Message Date
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
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
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
SongFerng Wang
19b516807e Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev am: 71a5715e3e am: 535a91afff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405361

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

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

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

Change-Id: I5480462b9262f5d8ee51f23a97d3bde7ab39082c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 10:14:58 +00:00
Treehugger Robot
3b3b66ec0e Merge "Owners updates" am: b2b16851ef am: 340fde1f0f am: b41ce7e248
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601706

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

Change-Id: I1f0f8264b33b5b826d54da4adca8c2c4409af79b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 10:10:09 +00:00
SongFerng Wang
71a5715e3e Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev 2023-05-24 09:42:17 +00:00
Treehugger Robot
b41ce7e248 Merge "Owners updates" am: b2b16851ef am: 340fde1f0f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601706

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

Change-Id: Ib5cb883e88bc5c06eb4946b4f01e610c764e6c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 08:52:03 +00:00
Treehugger Robot
340fde1f0f Merge "Owners updates" am: b2b16851ef
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601706

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

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

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

Change-Id: I07ace8e200477511259198b69e740a4e4cfc057c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 08:04:58 +00:00
Treehugger Robot
b2b16851ef Merge "Owners updates" 2023-05-24 07:54:26 +00:00
Weng Su
e12733d72f Owners updates
- English prefix order update

Test: N/A, just owners update
Change-Id: I8faae968bc0860be2f2cb8503949938a82d2abbd
2023-05-24 07:41:50 +00:00
Jason Hsu
fe00702ab3 Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev 2023-05-24 07:38:09 +00:00
Treehugger Robot
29fce86c74 Merge "Owners updates" am: 21bc49159a am: e638ec642f am: d0af78bc76 am: a0a0b501ce
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601705

Change-Id: I1a2a1b4fc4687d0349761a478f92208b46856b01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 06:03:14 +00:00
Treehugger Robot
a0a0b501ce Merge "Owners updates" am: 21bc49159a am: e638ec642f am: d0af78bc76
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601705

Change-Id: I8ca0208b241e08b00e0778d5ec68f8d3a74f04d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 05:18:00 +00:00
SongFerngWang
1872151b4f The BluetoothDevicePreference register the MetadataChanged
The bluetooth device preference needs to refresh UI after MetadataChanged
Fix: 282877247
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDevicePreferenceTest

Change-Id: I02cb07a6b255242e4877089ce2f3b7559ce02362
2023-05-24 04:49:41 +00:00
Treehugger Robot
d0af78bc76 Merge "Owners updates" am: 21bc49159a am: e638ec642f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601705

Change-Id: I5194c7401859dfcae05a1729c9fdc95d118e9683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 04:32:15 +00:00
Bill Yi
4b4a28ef4a [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 skip reason: subject contains skip directive

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

Change-Id: Ie292c1a6afddc98eb89b5b8689328f6d90ca7b39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 03:55:12 +00:00
Bill Yi
51482e5650 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b -s ours am: affa411d4e -s ours am: 79b4a2bfe0 -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: I0e2da3264d3d683c32e3e1e00db45dcf1c344037
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 03:55:07 +00:00
Treehugger Robot
e638ec642f Merge "Owners updates" am: 21bc49159a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601705

Change-Id: I78863e0d04c593a97e49aa176d0469a3b2ac8418
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 03:53:00 +00:00
Bill Yi
8b8f302554 [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 skip reason: subject contains skip directive

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

Change-Id: I2251a84cb654cb2c08ea9d125cd03f06042621fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 03:50:29 +00:00
Bill Yi
3c5a358987 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b -s ours am: affa411d4e -s ours am: 7389f5fc2b -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: I487a4af1821ba2b40baba2cab55a240df807f8c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 03:50:25 +00:00
Bill Yi
0714fceee2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f -s ours am: 128036a053 -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: I302a9b8335448809a80ccfc83be95adc49926bba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 03:12:33 +00:00
Bill Yi
7389f5fc2b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b -s ours am: affa411d4e -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: If306c1e68711847a9ea27b79b49d6cc413d4ef86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 03:12:28 +00:00
Treehugger Robot
21bc49159a Merge "Owners updates" 2023-05-24 03:08:29 +00:00
Bill Yi
30884de198 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f -s ours am: 128036a053 -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: I56153ccd306f4196b3f766404a00c33b23f4d962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 03:08:09 +00:00
Bill Yi
79b4a2bfe0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b -s ours am: affa411d4e -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: I1a32414b289e3a1712f2c5b665987bf44a4779cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 03:08:04 +00:00
Daniel Huang
56ca06b8c5 Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd am: dd8283f708
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079

Change-Id: Iad2ba25515ff07424468e70373e420c8d14d6dd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 02:30:01 +00:00
Bill Yi
128036a053 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f -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: I48a6bc9f16fcae2bb4ccaeff9f11e68d236f74a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 02:28:19 +00:00
Bill Yi
affa411d4e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b -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: I078f8199a995e10e791117c367bfcc68f5e0905a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 02:28:03 +00:00
Daniel Huang
1dd13430cc Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd am: 35d25a92d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079

Change-Id: Iefd86e0d9ef6f948d634d8c89580362e0324d35b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 02:26:43 +00:00
Bill Yi
07b6109a0f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-05-24 01:54:48 +00:00
Daniel Huang
35d25a92d1 Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079

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

Change-Id: I285f4552d871aeccbbead17b85b43cdb317e6868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 01:43:12 +00:00
Daniel Huang
e51bbfcbbd Merge "Update summary for Languages and Keyboard" into udc-dev 2023-05-24 01:09:38 +00:00