Bill Yi
eef1d4e91f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e
-s ours am: 75d96641c6
-s ours am: 7b59a40d17
-s ours am: b89b43bf79
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811297
Change-Id: If17759c4ed3524f950dca8cac2d81e4c7caa17be
2021-09-12 13:57:28 +00:00
Bill Yi
6a322c0f51
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce
-s ours am: 2bc492b5a6
-s ours am: 080db6b64d
-s ours am: 9f2415ea70
-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: I3e0aaadf6fc4d7db4adb325069ca99d6ab2bf685
2021-09-12 13:57:07 +00:00
Bill Yi
855f9e5125
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e
-s ours am: 75d96641c6
-s ours am: a1fbab88b0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811297
Change-Id: Iceabb5681511ec764c6f6f2080016937ed70bc6a
2021-09-12 13:43:25 +00:00
Bill Yi
c17d7563c0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e
-s ours am: 75d96641c6
-s ours am: a1fbab88b0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811297
Change-Id: I6ac735c3a33e3064ac010f4c2c940f43ecabbebf
2021-09-12 13:43:16 +00:00
Bill Yi
8ce118a210
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce
-s ours am: 2bc492b5a6
-s ours am: a6262f4929
-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: If16edc27fcafeedaebd585f7751c798c993b93b7
2021-09-12 13:43:08 +00:00
Bill Yi
5b1fdf9c97
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce
-s ours am: 2bc492b5a6
-s ours am: a6262f4929
-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: I71dfd2c468ec965aa249177ad4d3cdb1ec2c3071
2021-09-12 13:43:01 +00:00
Bill Yi
b89b43bf79
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e
-s ours am: 75d96641c6
-s ours am: 7b59a40d17
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811297
Change-Id: Icaed89a976f212712af5fc73c8256e03c04cccb2
2021-09-12 13:42:54 +00:00
Bill Yi
9f2415ea70
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce
-s ours am: 2bc492b5a6
-s ours am: 080db6b64d
-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: I755e18813630f8815577e5a3f58af411077ce546
2021-09-12 13:42:43 +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
a1fbab88b0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e
-s ours am: 75d96641c6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811297
Change-Id: I2524cd8a07d10ec1cdf4aac42e972caa9e6a90f4
2021-09-12 13:28:23 +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
a6262f4929
[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: Ibf908ae1613110202f6bfa0ed16f575866121fb4
2021-09-12 13:28:15 +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
7b59a40d17
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e
-s ours am: 75d96641c6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811297
Change-Id: Ib76fa3621571832716728f486aafc0d01b6e6a60
2021-09-12 13:27:23 +00:00
Bill Yi
080db6b64d
[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: If3dfaff3154b221dc5c5e46c8434fefcb735bec2
2021-09-12 13:27:16 +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
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
75d96641c6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811297
Change-Id: Ieff57a9bcb1cb08bfff67c882d2d23d40bf8881c
2021-09-12 13:11:17 +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
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
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
98945e949e
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-09-12 12:57:50 +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
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
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
b2e42cabd4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9a37f3d6526c53393d047d99f8c19f2054e932f7
2021-09-11 09:05:32 +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
Yi-Ling Chuang
5fc96844e5
Correct how the injection mechanism starts activities
...
Settings Injection used to start activities with
startActivityForResult() and its extension, where there was not result
really being handled. Hence, this CL corrects the way it starts
activities by removing the "ForResult" part.
Fixes: 197704126
Test: robotest and launch Android Auto to see it being launched in
another task.
Change-Id: I259b2555cf62f8966afdf664b337af5f216b3843
2021-09-11 16:48:37 +08: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
Neil Fuller
b46adff0f4
Swap ownership to mingaleev@
...
BUG=189810551
Change-Id: I6304545540947d6695117753309c80b27cf2669a
2021-09-10 12:20:39 +00:00
Bonian Chen
05727f206b
[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 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: I0d7901c7b0e11ee5c5e2327c4c509dd0b307266a
2021-09-10 10:48:04 +00:00
Bonian Chen
d010033f00
[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 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: I4aa99ad4e762506fb17feb8d6ffc3d8f03f2d15b
2021-09-10 10:31:13 +00:00
Bonian Chen
58d30bf442
[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 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: I9d32b04abf40f188d302fe752f44ed7d03aa2bcd
2021-09-10 10:11:19 +00:00
Bonian Chen
6c1c8934a2
[automerger skipped] Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" am: 4c3f454c92
-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: Iab613dc14204401318bd69648dad6c7d2f49e723
2021-09-10 09:59:38 +00:00
Bonian Chen
4c3f454c92
Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed"
2021-09-10 09:46:32 +00:00
ykhung
bb535f4bce
Move allowed list definition in the battery usage to feature provider am: b62cdecc67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785737
Change-Id: I01745bccfb5cf44fbdfeedd1db6ad2b88a0c71a2
2021-09-10 05:03:32 +00:00
Ting Yu
638f12a6c8
Fix Text of VoLTE setting cannot be updated when SIM state is changed
...
Text of setting menu for VoLTE should be changed from "VoLTE" to
"4G Calling" if "show_4g_for_lte_data_icon_bool" is true. However, it
is not changed in the following steps.
1. Turn Use SIM off on Mobile Network Setting and close Mobile Network
Setting screen.
2. Open Mobile Network Setting screen again and turn Use SIM on.
Root cause is that the carrier config value is loaded only when SIM's
subid is changed. So, remove checking subId so that the carrier config
value is updated.
Additional fix:
Removed checking #isModeMatched in # onStart because "4G calling"
Setting was grayed out. It needs to listen to call state change
regardless of display status of the preference because Preference may
be switched even after the screen is displayed.
Test: manual
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Bug: 196030198
Change-Id: Ibf4d17aa493f69a3f00e35ae0e9d1419bd9e0d77
Merged-In: Ibf4d17aa493f69a3f00e35ae0e9d1419bd9e0d77
2021-09-10 01:17:26 +00:00
Bill Yi
3ce2bc2361
[automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: f4e2f69f3a
-s ours am: 74305a655a
-s ours am: 2180784c46
-s ours am: a66a06e20a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1822789
Change-Id: Id0cf8ca4564c096b738ee37792f8c88692189630
2021-09-09 22:48:37 +00:00
Bill Yi
a66a06e20a
[automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: f4e2f69f3a
-s ours am: 74305a655a
-s ours am: 2180784c46
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1822789
Change-Id: I36d53b74ccde439c5c6b96f2a2f8f2622d538c38
2021-09-09 22:29:33 +00:00