Diya Bera
a1b55642d7
Fingerprint Error Dialog am: 71dd391e4d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197
Change-Id: I10bc9d2bd96d8e25d658d370b71ae83ee5053b0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 20:14:20 +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
b73bb7d036
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: I653ece7fb3af223d4ecaa946cbc03023a543a10f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 10:14:33 +00:00
SongFerng Wang
71a5715e3e
Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev
2023-05-24 09:42:17 +00:00
Jason Hsu
0a1e716094
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: Icdffe1faaf5db8e109b14fe8389b826bf1785a8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 08:09:03 +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
7ee1c41818
[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: I935fdcd14f5da7eb1451b57d61d4e72c66307c68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 03:12:20 +00:00
Bill Yi
1ccd7dca42
[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: Ie0739e44017556aa9f461214fa6701ad03dc289a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 03:12:16 +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
9917138881
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: I4218d4067f1e8a788203d017b97323b693f554f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 01:45:31 +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
b2fa6cce12
[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: I07fe50dc7c5aca970455d3617b5ac9ebad987d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:53:57 +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
af52cb7b70
[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: Icee3f589ed9f5222858cbb1dd2cf0c72803e1715
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:48:42 +00:00
Bill Yi
1b70e8447c
[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: Ifa9a2ee6e917b31e788b04dcef31d7cf00ded5c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:48:19 +00:00
Bill Yi
c18a26cfc7
[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: Iddaa11be6ac7e6a3c639078bb62e3baf774b44f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:47:12 +00:00
Bill Yi
12d0871239
[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: Idfb159e61252f4c1fe92b9d726d01849013b063b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:46:55 +00:00
Bill Yi
2209398336
[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: I25f2da19f01bbec425ae6e5f948eb48e9814e72f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:46:50 +00:00
Bill Yi
9284a7ce05
[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: I56c00e1713b9fabada798f6d3020da4363feca76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:46:26 +00:00
Bill Yi
39fefbc6bc
[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: I54e19805043853330c6201677935098746071563
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:46:03 +00:00
Bill Yi
2dea83b0ca
[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: I81337832cda034aed8e0336ae0633dc61e3916e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:45:43 +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
e60a567d50
[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: I0e765915496be8324022fc13d16b3e9f0d6af3a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 17:31:59 +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
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
bc009a21b6
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: I2f3d38f49e9a59ceee11408599a01ed0797e5709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 03:30:13 +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
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
ec62456295
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: If1cc6919399e2ae83bcefd41f40dd962a0bea9a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 21:08:19 +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ć
1e5790a118
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: Ie91638fc5840f853ec97660394f8daf96731d125
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 16:11:22 +00:00
Aleksandar Kiridžić
bcae90c372
Merge "speech: Remove hard-coded preference key from the controllers" into udc-dev
2023-05-22 15:40:08 +00:00
Behnam Heydarshahi
a17acaf518
Merge "Remove volume_separate_notification flag" into udc-dev am: 7aa8424cc0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23244447
Change-Id: I0a7d7b9b1870ef7a9d988f760c6693928fbb276b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 14:48:13 +00:00
Behnam Heydarshahi
7aa8424cc0
Merge "Remove volume_separate_notification flag" into udc-dev
2023-05-22 14:09:22 +00:00
Himanshu Gupta
5e7cc581f3
Merge "Clearing obsolete cloneUserId from CloneBackend." into udc-dev am: 4740720948
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262239
Change-Id: Ic2794491157aaa448276e063935bb9ea10a0496e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-19 21:12:27 +00:00