Bill Yi
4d58ae10b4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb
-s ours am: dbee886a9a
-s ours am: cd693e3bbd
-s ours am: b8a14ba9ec
-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: Id714d6ebbe42570dfaab0428d5949940d5b230a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 18:21:20 +00:00
Bill Yi
2ee79a52b0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb
-s ours am: dbee886a9a
-s ours am: 5640cd61f6
-s ours am: bae7564f5b
-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: I901c04992197e136332f2548205af5dccbd1e981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 18:20:18 +00:00
Bill Yi
76641727a1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb
-s ours am: dbee886a9a
-s ours am: 5640cd61f6
-s ours am: 54b1413701
-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: Ibc3e02ed11ccc0fab9974f0fd52805aaa7c06a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 17:22:21 +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
b8a14ba9ec
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb
-s ours am: dbee886a9a
-s ours am: cd693e3bbd
-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: Ia08db4c04fd1ae501bc29b40e1525691c03e5791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 17:14:56 +00:00
Bill Yi
bae7564f5b
[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: I7d0e3010ff0cb260c57c0568318201a76180d9f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 17:14:08 +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
cd693e3bbd
[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: I6408e40021dac214d71a0b4bf5019a58fefd8611
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 17:13:02 +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
76775dc8c6
Merge "Fix the bytes displayed unit" into udc-qpr-dev am: 3168137798
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23385138
Change-Id: I6c13ec6ad7da804739921679900e04f54d3d9611
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 11:34:37 +00:00
Chaohui Wang
3168137798
Merge "Fix the bytes displayed unit" into udc-qpr-dev
2023-05-23 11:03:59 +00: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
07d97674d7
Merge "Add new bond entry to HearingAidInfoReported" into udc-dev am: 07563f6269
am: 5821b2c9cc
am: ce5f679db5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23345338
Change-Id: Iaa855892fa40787b3f33b67f01809038273a2e12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 04:56:15 +00:00
Angela Wang
dcd6a522fb
Merge "Add new bond entry to HearingAidInfoReported" into udc-dev am: 07563f6269
am: e969ce77f8
am: 8c3158329c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23345338
Change-Id: I0ea2c135ab202746d702ab99c1b7b558b607816c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 04:52:40 +00:00
Angela Wang
1cb99bf285
Merge "Add new bond entry to HearingAidInfoReported" into udc-dev am: 07563f6269
am: 5821b2c9cc
am: b89762e58f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23345338
Change-Id: Ide9f9bce59a787ebaf552cf4136807d4ee5f62a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 04:50:35 +00: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
8c3158329c
Merge "Add new bond entry to HearingAidInfoReported" into udc-dev am: 07563f6269
am: e969ce77f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23345338
Change-Id: Ib0a2d8b7f62b604a5f0381732283eac5262d8571
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 04:13:46 +00:00
Angela Wang
b89762e58f
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: I74467553fd67caa12700f0e2b2c6dcc5af787b7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 04:09:48 +00:00
Angela Wang
e969ce77f8
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: If2b609d4f6edf0bee1220d38d6419419ce819e61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 03:30:41 +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
0229581abb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I001817a76ffa02590155c033d1f7fb87c79832cb
2023-05-22 16:46:36 -07:00
Automerger Merge Worker
48e7fe9878
Merge "Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17
am: 975b03405f
am: 848c4689b7" into udc-qpr-dev-plus-aosp
2023-05-22 22:34:32 +00:00
Lucas Silva
730c0f020c
Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17
am: 975b03405f
am: 848c4689b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23321459
Change-Id: I3c391c7c90ae8b4a1ed4f68559106a777062dc4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 22:34:26 +00:00
Lucas Silva
bb52658b8f
Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17
am: 2611253691
am: 2190ead573
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23321459
Change-Id: I8fd832022e265f8a1cf3a4a58c38f1d90c06ecf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 22:34:15 +00:00
Lucas Silva
04564ec935
Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17
am: 2611253691
am: 308d4f1e46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23321459
Change-Id: I30f062e5f81b74030a69a6762f7a79e3dea671f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 22:28:41 +00: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
848c4689b7
Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17
am: 975b03405f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23321459
Change-Id: Idea1eab3f671c243553ae587bb19d15d59d05c30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 21:51:53 +00:00
Lucas Silva
308d4f1e46
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: Idf7390468792fca7dd34d53efd964580ec5c4567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 21:47:12 +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
975b03405f
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: Ibd8e11b0cd11ff6ecb17a5b71ae8895e850d5b12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 21:04:21 +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ć
4e6e88db06
Merge "speech: Remove hard-coded preference key from the controllers" into udc-dev am: bcae90c372
am: b5d3fc5b53
am: 44424b462f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23353398
Change-Id: Ic81b6cb27960a5dc7489e46b20b35976c17d8438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 18:14:37 +00:00
Aleksandar Kiridžić
8ae957a01f
Merge "speech: Remove hard-coded preference key from the controllers" into udc-dev am: bcae90c372
am: 24428d1863
am: 6ec7ba0d5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23353398
Change-Id: I6242ecf35153249351a12dd69e0b26a183fe90e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 18:13:09 +00:00
Aleksandar Kiridžić
7e1738c7d1
Merge "speech: Remove hard-coded preference key from the controllers" into udc-dev am: bcae90c372
am: 24428d1863
am: f7e3a2ce45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23353398
Change-Id: Ic28a59464195632f377ccbfe0be9b6719e156dde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 17:13:11 +00:00
Aleksandar Kiridžić
44424b462f
Merge "speech: Remove hard-coded preference key from the controllers" into udc-dev am: bcae90c372
am: b5d3fc5b53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23353398
Change-Id: Ic28dd33174b358c63e8f286fe02d594c5697c9c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 16:40:50 +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ć
6ec7ba0d5b
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: I88e5b182e607e9b6cd5a8caafd38cd607ec4fbff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 16:37:25 +00:00
Aleksandar Kiridžić
b5d3fc5b53
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: I78b084b6a61b579ec92c183463dde22f44367bbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 16:13:19 +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
Behnam Heydarshahi
c37f6de459
Merge "Remove volume_separate_notification flag" into udc-dev am: 7aa8424cc0
am: 66dd57ea6e
am: 2ba634defc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23244447
Change-Id: If89d6b326175692308d94d1d39ea49b836a440c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 15:48:45 +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
2dc515803c
Merge "Remove volume_separate_notification flag" into udc-dev am: 7aa8424cc0
am: 66dd57ea6e
am: afa72d6f3b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23244447
Change-Id: Ia240bbebe36b61adf1b731780fa746eea0f2936f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 15:17:34 +00:00
Behnam Heydarshahi
3f1f842250
Merge "Remove volume_separate_notification flag" into udc-dev am: 7aa8424cc0
am: 2aecb2f1ea
am: ffbc25e249
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23244447
Change-Id: I2fe0b29add60d26dab32d142d970f2ee3ad7781c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 15:17:18 +00:00
Behnam Heydarshahi
2ba634defc
Merge "Remove volume_separate_notification flag" into udc-dev am: 7aa8424cc0
am: 66dd57ea6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23244447
Change-Id: I7321e1606c81be721525e9d616587b9a026722df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 15:16:05 +00:00
Behnam Heydarshahi
afa72d6f3b
Merge "Remove volume_separate_notification flag" into udc-dev am: 7aa8424cc0
am: 66dd57ea6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23244447
Change-Id: Idb89740bd368bae7f53f787159d0c0e3953e8ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 15:13:26 +00:00
Behnam Heydarshahi
66dd57ea6e
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: Ie146780b807211d786039a5d022d3be8246616e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 14:49:15 +00:00
Behnam Heydarshahi
ffbc25e249
Merge "Remove volume_separate_notification flag" into udc-dev am: 7aa8424cc0
am: 2aecb2f1ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23244447
Change-Id: I70ddbb0ecd7a1553a8d07b3ee47c305399edeb58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 14:48:56 +00:00
Behnam Heydarshahi
2aecb2f1ea
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: I6798c7a2e2020eb1ca4dbe6dbf1cb7ccc50a76b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-22 14:21:55 +00:00
Behnam Heydarshahi
7aa8424cc0
Merge "Remove volume_separate_notification flag" into udc-dev
2023-05-22 14:09:22 +00:00