Bill Yi
8130142396
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce -s ours am: 2bc492b5a6 -s ours am: 25884c44b1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811295
Change-Id: Ia1630d9920b1724c69b50328892eb4cf0ad06e3e
2021-09-12 13:42:14 +00:00
Bill Yi
831ebcbddc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0444a1a047 -s ours am: 84c8cce97e -s ours am: 520f4ee356 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811407
Change-Id: I39a3bfb35e885a75eaf053856226a5e2a4764207
2021-09-12 13:32:49 +00:00
Bill Yi
6c4ddd0166
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641 am: b1e28007d4 -s ours am: d056c27aef -s ours am: 98cacdb937 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811299
Change-Id: I3a7c74bf2331189a6aa1528d90148bef463ca370
2021-09-12 13:31:36 +00:00
Bill Yi
31c4897d0e
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641 am: 78d0880792 -s ours am: 1c9390c614 -s ours am: 038e153f01 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811299
Change-Id: I02965030913685f218df49315cdc7501024284d6
2021-09-12 13:30:43 +00:00
Bill Yi
be433d75da
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0444a1a047 -s ours am: fcfda43bea -s ours am: 86cacf70aa -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811407
Change-Id: I65c9a85f8e26391a7d640f052f0b92e64c9020e0
2021-09-12 13:29:38 +00:00
Bill Yi
520f4ee356
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0444a1a047 -s ours am: 84c8cce97e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811407
Change-Id: I9cbbad398a9fdd902376581cf356177574510675
2021-09-12 13:29:04 +00:00
Bill Yi
0cbac6f457
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641 am: b1e28007d4 -s ours am: e7b71e21f7 -s ours am: 7cd88a6fbd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811299
Change-Id: Idb6e3d31d9242175f8e62a4c0571eb03c8564791
2021-09-12 13:28:32 +00:00
Bill Yi
98cacdb937
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641 am: b1e28007d4 -s ours am: d056c27aef -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811299
Change-Id: I0b6e42d5604ce0c29bd45b81f74f337b5535c7ec
2021-09-12 13:28:19 +00:00
Bill Yi
af1f288384
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 7f61b4eb74 -s ours am: cbe48c99a4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811411
Change-Id: I9a2c09e735ea4eb3ba4f323ffaec43133686435c
2021-09-12 13:27:36 +00:00
Bill Yi
038e153f01
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641 am: 78d0880792 -s ours am: 1c9390c614 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811299
Change-Id: I8b6c3ac4edd682dffd6a745ea0bd22e54d035fbb
2021-09-12 13:27:30 +00:00
Bill Yi
25884c44b1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce -s ours am: 2bc492b5a6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811295
Change-Id: Ie80c4fe0db505f2695e0175b8083a3ab06e147c8
2021-09-12 13:27:23 +00:00
Bill Yi
84c8cce97e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0444a1a047 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811407
Change-Id: I18e0855054dd67edc6985c6fdc12b122fbee5944
2021-09-12 13:13:18 +00:00
Bill Yi
86cacf70aa
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0444a1a047 -s ours am: fcfda43bea -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811407
Change-Id: If14266ebb0c61d1c36aec8cc079ef53df1ee9cde
2021-09-12 13:13:02 +00:00
Bill Yi
a00d0e11bb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 0f159f7a96 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811146
Change-Id: I5bf1c0f45d78fd0b2f733d0a3115337308627d39
2021-09-12 13:12:53 +00:00
Bill Yi
fcfda43bea
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0444a1a047 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811407
Change-Id: I9896ddd961fae69c3cfbe0e0cda3e4f7145a9956
2021-09-12 13:12:37 +00:00
Bill Yi
d056c27aef
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641 am: b1e28007d4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811299
Change-Id: I34b94c1b42a6f0dbacc5b0e8b13866d5cab656b0
2021-09-12 13:12:09 +00:00
Bill Yi
7cd88a6fbd
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641 am: b1e28007d4 -s ours am: e7b71e21f7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811299
Change-Id: I52eb57154fe1c959d45dcd0b8d4b863c3ec4faa2
2021-09-12 13:12:04 +00:00
Bill Yi
e7b71e21f7
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641 am: b1e28007d4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811299
Change-Id: Id3cdc138f8fca9a1ce62c5f6fdb5c6d4e92b05fa
2021-09-12 13:11:39 +00:00
Bill Yi
edee57793d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 7d4c3475b1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811288
Change-Id: Ibc0a7df07a425b681a3a740392efc0a8f6060b6c
2021-09-12 13:11:16 +00:00
Bill Yi
cbe48c99a4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 7f61b4eb74 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811411
Change-Id: Ice32a072a0d7584adb342031e2fc426c07f4e9e4
2021-09-12 13:11:08 +00:00
Bill Yi
2bc492b5a6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811295
Change-Id: I5c98246752b54a166967392171d412f79fa3dfce
2021-09-12 13:11:08 +00:00
Bill Yi
1c9390c614
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641 am: 78d0880792 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811299
Change-Id: Ie370a49faa9729372de252a89a8cf3d5bb5cb2f2
2021-09-12 13:11:04 +00:00
Bill Yi
7f61b4eb74
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-09-12 13:00:06 +00:00
Bill Yi
0444a1a047
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-09-12 12:59:03 +00:00
Bill Yi
0f159f7a96
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-09-12 12:57:24 +00:00
Bill Yi
c96f050efe
Merge changes from topic "presubmit-am-b8b51bd0593c4869a4b435ca3d6c4fa7"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0aff4035e8
Import translations. DO NOT MERGE ANYWHERE
2021-09-12 12:57:24 +00:00
Bill Yi
7d4c3475b1
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-09-12 12:56:09 +00:00
Bill Yi
007f4db05d
Merge changes from topic "presubmit-am-bf7015b3e38e4fd38f91bb45fc12b788"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7ad96282b3
Import translations. DO NOT MERGE ANYWHERE
2021-09-12 12:56:09 +00:00
Bill Yi
9a7044c387
Merge changes from topic "presubmit-am-2497fdcbcbb2490280b2d6fa36e8e9ef"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641 2p: 10d047524a
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641
Import translations. DO NOT MERGE ANYWHERE
2021-09-12 12:56:02 +00:00
Bill Yi
8649a2ab79
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-09-12 12:54:54 +00:00
ykhung
dfd2bf044f
Fix failed tests since presubmit is ignored in ag/15802168 am: 27efa546cf am: a168e2e0fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15809054
Change-Id: I8396a058b78d2c37ebf223e26884860061a08b84
2021-09-11 18:25:11 +00:00
ykhung
a168e2e0fc
Fix failed tests since presubmit is ignored in ag/15802168 am: 27efa546cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15809054
Change-Id: I5b0e17f5862f295da35456f691dfcdc32587bcdc
2021-09-11 18:13:37 +00:00
ykhung
27efa546cf
Fix failed tests since presubmit is ignored in ag/15802168
...
Bug: 198553245
Test: make SettingsRoboTests
Change-Id: I91e715a6bfb64419b457812423996365a9464a93
2021-09-12 00:36:43 +08:00
Bill Yi
d8d10737ed
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I311a7f810ad7d87becf30a0f36c61565db4624ed
2021-09-11 09:13:02 +00:00
Bill Yi
dfa9ca0dff
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3b28169e85744c126af035cae96f457b7d9471ea
2021-09-11 09:11:27 +00:00
Bill Yi
009a3553a6
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641 2p: 10d047524a
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811299
Change-Id: I6456018dc11ad2e745ce4a6230a7bad9f137bfc1
2021-09-11 09:10:09 +00:00
Bill Yi
78d0880792
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811299
Change-Id: Icab5517ddc19bbe60183846d4f85bef549b0e3e8
2021-09-11 09:10:05 +00:00
Bill Yi
b1e28007d4
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811299
Change-Id: I7e8aa5a5b4825dba96ed2f220eb073506ee4bc53
2021-09-11 09:10:04 +00:00
Bill Yi
10d047524a
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811299
Change-Id: I5d2a8eaa5039f9321a04756907740e76f46bbe12
2021-09-11 09:10:04 +00:00
Bill Yi
a5d4317641
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I89637d7c6419239e93a6dd005268adcf378c2291
2021-09-11 09:09:53 +00:00
Bill Yi
0a73bc008c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icb5beed9ab6d841a08ff5888be40df03b6edc9a3
2021-09-11 09:08:17 +00:00
Bill Yi
24917c6fce
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id7feff6bce69e46b992f5062c6fe2679f3fdd429
2021-09-11 09:02:07 +00:00
Bill Yi
285a7d67d0
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7ad96282b3
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811288
Change-Id: I06540bb37b7a3158ce3d18dbce1d67b731b509cf
2021-09-11 08:55:59 +00:00
Bill Yi
7ad96282b3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I833bb37f1ed91e685017879fefe173d30ab447fc
2021-09-11 08:55:27 +00:00
Bill Yi
6c6cfeb024
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0aff4035e8
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811146
Change-Id: I75fe9ddc750ebfcef15aedfc29f286e7dcacbaf0
2021-09-11 08:51:58 +00:00
Bill Yi
0aff4035e8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4a64879a0fd4b69657dd45a18463d70d04f61cde
2021-09-11 08:51:47 +00:00
ykhung
27d9bdfb82
Fix the icon flash issue cause from the shared drawable icon am: a3b89868f4 am: e44128f021
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15802168
Change-Id: If1a9387932316ff3b4addea1075d8d69853d38dc
2021-09-11 00:24:09 +00:00
ykhung
e44128f021
Fix the icon flash issue cause from the shared drawable icon am: a3b89868f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15802168
Change-Id: I4b3e87e071a2fec6ace88afe1336be08e77c4075
2021-09-11 00:13:28 +00:00
ykhung
a3b89868f4
Fix the icon flash issue cause from the shared drawable icon
...
different time slot may have the same application entry, we should not make them share the same drawable instance to impact the states, we will use newDrawable() method to create a new one for each application entry
Bug: 198553245
Test: make SettingsRoboTests
Change-Id: I4a321133ba171817fca1ab7ad47b9af8f7450675
2021-09-10 16:50:43 +00:00
Bonian Chen
2c3f21ad76
[automerger skipped] Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" am: 4c3f454c92 -s ours am: 6c1c8934a2 -s ours am: 58d30bf442 -s ours am: d010033f00 -s ours am: 05727f206b -s ours
...
am skip reason: Merged-In Ibf4d17aa493f69a3f00e35ae0e9d1419bd9e0d77 with SHA-1 f56682808e is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1791947
Change-Id: I91e6577c8e3e716b13654c1f7ecfc6d1c9f59a98
2021-09-10 11:03:09 +00:00