Bill Yi
9abc6dfab9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 197ad03f9e
-s ours am: 90323d459e
-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: I7725b19e869f8aa962f808f422b541ac5cc40a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:55:48 +00:00
Bill Yi
e04ac53021
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: dd664531a5
-s ours am: 6f9dae1c63
-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: I7d35276a34014a8f7692c6847a29bd4df4e980f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:55:26 +00:00
Bill Yi
1eac4d3913
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81564a8384
-s ours am: c02f810e09
-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: I6bd7ec47df82c7e97486ecdc8bd02b3f25659863
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:55:07 +00:00
Bill Yi
d2bd70c172
[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: I8e3796f0a823a3f5e02f8a378667c84917c7075e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:51:37 +00:00
Bill Yi
e379726b51
[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: I51fa5399aee84218d0f5153fcd043b08b99c5da3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:49:17 +00:00
Bill Yi
1187b059e5
[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: Ic45ae1c350a0080ee29dbf3440ff5eaecf3e5986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:48:54 +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
425f03d8c2
[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: I6c5aee25f196299a420d4ee38abca33e1c98ca7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:34:40 +00:00
Bill Yi
0ff2acd74e
[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: I89e16e27a437bffab025f596c2867707615d7805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:34:36 +00:00
Bill Yi
851cd09273
[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: Iff1f5aa8165a82565818a9e78f2584043a3a5c1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:34:31 +00:00
Bill Yi
90323d459e
[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: Idefdc227aadcda4c4793e04db6a30b9cfd53e689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:34:06 +00:00
Bill Yi
6f9dae1c63
[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: I2640800318de23e73f14caf0a9eb3b9ec9a0d941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:33:44 +00:00
Bill Yi
c02f810e09
[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: Iadc3952765dbe96b9be66fdca437c96ecb12be25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:33:24 +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
29ffda8638
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-05-23 23:08:38 +00:00
Bill Yi
d17812db69
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-05-23 23:08:38 +00:00
Bill Yi
0ab89bcac1
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-05-23 23:08:38 +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
54b1413701
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb
-s ours am: dbee886a9a
-s ours am: 5640cd61f6
-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: I7c9a61bfbf67805aaecd7ddd2b7b3bcd49898f29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 17:15:55 +00:00
Bill Yi
5640cd61f6
[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: I4beb1bea66860ecc9b7b63ac01228d376ac6f2cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 17:13:09 +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
Chaohui Wang
3168137798
Merge "Fix the bytes displayed unit" into udc-qpr-dev
2023-05-23 11:03:59 +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
Chaohui Wang
a95d62a4a8
Fix the bytes displayed unit
...
This used to by MByte and GByte, not used in other places in Settings,
and not align with the data summary on the same page.
Unify to MB and GB to align with other places in Settings and the data
summary on the same page.
Fix: 277900792
Test: Visual
Test: Unit test
Change-Id: I9f8ceac470aede135b7921c391c063ba87da661e
2023-05-23 14:21:03 +08:00
Angela Wang
ce5f679db5
Merge "Add new bond entry to HearingAidInfoReported" into udc-dev am: 07563f6269
am: 5821b2c9cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23345338
Change-Id: I1ea7a84d3f22ac225db3cb3dbd812f95f072e1ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 04:14:00 +00:00
Angela Wang
5821b2c9cc
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: Ic8325571466b6d382a9c7e359ffa8c0d1e6b37b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 03:30:30 +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
f1ab0d85e5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3271c70b306c0ba317a90a1ec804f5023b462046
2023-05-22 18:47:53 -07:00
Bill Yi
803df51b41
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5d61db1c098c36144558a0931248f0fb7ec43dbc
2023-05-22 18:39:26 -07:00
Bill Yi
7e27faf3b1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I41e046a7592cee9cd908794c8e8dd12d0ac26552
2023-05-22 18:34:53 -07:00
Bill Yi
26b373a3e4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2e960dcff6c8cdef883281b7df7b64acc9c3fea9
2023-05-22 16:55:54 -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
853e7ddba0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iaa1e63c891ede7a0ca591b18add3f148d24ef79e
2023-05-22 16:50:05 -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
11ab2c74b9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I49f7f773f723b854cf11bfeb5553edcb247be150
2023-05-22 16:45:40 -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
2190ead573
Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17
am: 2611253691
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23321459
Change-Id: I4ae13573dd8858c2f121bbcc859488601eae7c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 21:52:02 +00:00
Lucas Silva
2611253691
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: I05815946cd5be092dbba4767bb9e855e81060ccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 21:08:59 +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ć
f7e3a2ce45
Merge "speech: Remove hard-coded preference key from the controllers" into udc-dev am: bcae90c372
am: 24428d1863
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23353398
Change-Id: I3cc5b8b385eec247439716393f438543b41f48ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 16:40:14 +00:00
Aleksandar Kiridžić
24428d1863
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: I147940935719c7baa482fa6f9b8a0111d4bdb4ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 16:12:09 +00:00