Commit Graph

122844 Commits

Author SHA1 Message Date
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
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
SongFerng Wang
760b01a081 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: I74e0a5236d47238d9d6c773e32994f772b922c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 09:45:05 +00:00
Jason Hsu
c347441acc 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: Iad256f14ee905463324ecd402aa4ac8b324699eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 09:42:30 +00:00
SongFerng Wang
71a5715e3e Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev 2023-05-24 09:42:17 +00:00
Bill Yi
badeed703c [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: I0861f30b161f325770af76d485b697491f4830e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 09:41:57 +00:00
Bill Yi
9b61f3aac9 [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: I08b3c9380756b03c352bdc21ff21bb46e0812683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 09:41:54 +00:00
Daniel Huang
09296b5cdd 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: I7eb87a1fba1768eeefa0248d38f87316da3b5231
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 09:40:22 +00:00
Bill Yi
7ffa45e08f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02863edd4e -s ours am: c40e106be2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7fdff98e3427a7c29b65668c0626508818db08f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 09:39:17 +00:00
Bill Yi
5b23a264e9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -s ours am: 789290be46 -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: Ibdc3db06c5666f7d5dd76567ca788da03c31709c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 09:37:32 +00:00
Bill Yi
7316a42fd9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -s ours am: c5a289d530 -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: I36a2552583affaf2e50c49f9491c228de8d84909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 09:37:11 +00:00
Bill Yi
c024f39b78 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c13633d1d0 -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: If7c4d18affd90c4bd2f8403d6ab7d1196144889c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 09:36:23 +00:00
Bill Yi
ecfc3df071 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2e8c8077b -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: Ib64f3155f9e3d52ace4ea261850c73794795e68a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 09:36:19 +00:00
Bill Yi
0efe096619 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 67553d6348 -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: I33412a8e9b98de986453ef07732f11164eed91ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 09:36:14 +00:00
Bill Yi
c7f64a3e99 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 197ad03f9e -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: Ife23832514039436cb0b3db04ca47fcd83c4c47a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 09:35:48 +00:00
Bill Yi
4fdb6d6372 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: dd664531a5 -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: Ibb262569777335c93fe2a704c863085c7c3a56df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 09:35:25 +00:00
Bill Yi
df526aa998 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81564a8384 -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: I23c72f96a83cddd34640971057e68649c6ca2477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 09:35:07 +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
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
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
Bill Yi
07b6109a0f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-05-24 01:54:48 +00:00
Daniel Huang
e51bbfcbbd Merge "Update summary for Languages and Keyboard" into udc-dev 2023-05-24 01:09:38 +00:00
Bill Yi
c40e106be2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02863edd4e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9c6c9f25681b90088183001886e90201f6a3cee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 23:48:48 +00:00
Bill Yi
789290be46 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -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: Id43e7b6ad2a44a63517ba4d6ef18e4fef367bb78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 23:32:02 +00:00
Bill Yi
c5a289d530 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -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: Iec87273cf2cd0cee417d4eb7e10e1b0327d3f9aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 23:31:27 +00:00
Bill Yi
c13633d1d0 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-23 23:05:26 +00:00
Bill Yi
67553d6348 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-23 23:05:26 +00:00
Bill Yi
dd664531a5 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-23 23:05:26 +00:00
Bill Yi
27d96e91e7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-05-23 23:01:47 +00:00
Bill Yi
c6b347a2d4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb -s ours am: dbee886a9a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I82dbaf4c4645931681ae7920525b71d263280d92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 17:12:54 +00:00
Treehugger Robot
abc0f3d620 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-05-23 17:12:16 +00:00
Bill Yi
dbee886a9a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0fe484d0ba8eb4210731201c9f317ae59e1bb6a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 17:10:14 +00:00
Treehugger Robot
4ec08147d7 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-05-23 16:36:23 +00:00
danielwbhuang
d591a0ee2c Update summary for Languages and Keyboard
move speech to Languages

Bug: 283744490
Test: manual
Change-Id: I2df0aff11bb8e9b78f9816cd0ae1d1d56c438898
2023-05-23 17:24:32 +08:00
jasonwshsu
a0b2bcb2e0 Remove 'Media' type Audio output in Hearing devices settings
Root Cause: Media type Audio output has inconsistent result with Output Switcher, and it needs to be resolved from Audio Policies API.
Please see more details in b/279003337.
Solution: Remove 'Media' type in Android U temporary.

Bug: 283907809
Test: flash rom & check UI
Change-Id: Id64866f7dc12ca5429e0b961cbafe51329b4eef1
2023-05-23 16:34:50 +08:00
Angela Wang
8c5c2f1e1c Merge "Add new bond entry to HearingAidInfoReported" into udc-dev am: 07563f6269
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23345338

Change-Id: Idaec0c8b04c281c9453c51794b31f84f8bc27aae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 03:30:40 +00:00
Angela Wang
07563f6269 Merge "Add new bond entry to HearingAidInfoReported" into udc-dev 2023-05-23 02:30:07 +00:00
Bill Yi
1a24b1e9d9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I894daa0f4385efe36ed96421023f9bdd3ed33fa2
2023-05-22 18:31:40 -07:00
Bill Yi
00687505f0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia61b3542af3af62919e98627ef9ec62e8fb0d5ae
2023-05-22 18:29:47 -07:00
Bill Yi
197ad03f9e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I87f8876ce96c7a84d149ecfec08378ce67fb595d
2023-05-22 16:54:54 -07:00
Bill Yi
3c2e4800c6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib1c6d99be35bbe92e24a2060046717bc26397934
2023-05-22 16:52:00 -07:00
Bill Yi
d2e8c8077b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I01fb08b35dda455c5bc8e2b7d35173f854babcd4
2023-05-22 16:48:04 -07:00
Bill Yi
0229581abb Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I001817a76ffa02590155c033d1f7fb87c79832cb
2023-05-22 16:46:36 -07:00
Bill Yi
81564a8384 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2bd1ccafeb60d4eb8e1a9abcbeee5ad1083d0714
2023-05-22 16:44:40 -07:00
Bill Yi
e4cc2b888b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iffb438b8033773986e3c24d85f13199d23007994
2023-05-22 16:43:01 -07:00
Bill Yi
02863edd4e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I539b27b03f5c9c5dc0cf1dd44b3e4263bf617eff
2023-05-22 16:41:26 -07:00
Lucas Silva
c7b445f2d5 Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23321459

Change-Id: Ide2decf88a2e32a8712ab1980df4ff2d57d90665
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 21:08:33 +00:00
Lucas Silva
5bce93eb17 Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev 2023-05-22 20:35:16 +00:00
Aleksandar Kiridžić
380c08d62c Merge "speech: Remove hard-coded preference key from the controllers" into udc-dev am: bcae90c372
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23353398

Change-Id: Icd7905b9974f0a62d7b97e3f899107878fdf918f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 15:56:45 +00:00