Chaohui Wang
6c6149a2bc
Fix crash for DefaultSubscriptionController
...
setSummaryProvider() is used instead of setSummary() in
Ia24d88817c99db7ed3fc264dbc9c10e0a09d8a39, but there is still a place
using the setSummary(), mixing these two will lead to crash.
Change it to setSummaryProvider() to prevent crash.
Fix: 233295254
Fix: 233712251
Test: manual
Change-Id: I4627545711b848009c3bd7179f0368ff82e62697
(cherry picked from commit 2e34038233
)
Merged-In: I4627545711b848009c3bd7179f0368ff82e62697
2022-05-25 03:48:24 +00:00
Android Build Coastguard Worker
540f0446ec
Snap for 8637453 from efb1a9e43d
to tm-qpr1-release
...
Change-Id: I9b057ffd91a7306fc8efb80fbc342f980a8b46ab
2022-05-25 01:25:38 +00:00
Android Build Coastguard Worker
9e8666f576
Merge cherrypicks of [18573290] into tm-qpr1-release.
...
Change-Id: I6e526df6bc8e05604f39ad8acb35c82fcc2cbf06
2022-05-24 18:46:34 +00:00
Chaohui Wang
c271369295
Fix crash for DefaultSubscriptionController
...
setSummaryProvider() is used instead of setSummary() in
Ia24d88817c99db7ed3fc264dbc9c10e0a09d8a39, but there is still a place
using the setSummary(), mixing these two will lead to crash.
Change it to setSummaryProvider() to prevent crash.
Fix: 233295254
Fix: 233712251
Test: manual
Change-Id: I4627545711b848009c3bd7179f0368ff82e62697
(cherry picked from commit 2e34038233
)
Merged-In: I4627545711b848009c3bd7179f0368ff82e62697
2022-05-24 18:46:29 +00:00
TreeHugger Robot
efb1a9e43d
Merge "Fix can't start injected item problem" into tm-dev am: 74c324b70f
am: 0dc5eff113
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18570252
Change-Id: I4c2a4887ef53f8b8d1096105f83b378aa7768649
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 13:37:44 +00:00
TreeHugger Robot
0dc5eff113
Merge "Fix can't start injected item problem" into tm-dev am: 74c324b70f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18570252
Change-Id: Ie33b331b8facb0d59287bf445dd93bee1054cbe5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 13:03:03 +00:00
Edgar Wang
8f75078181
Merge "Fix talkback speak "double tap to activate" on LabeledSeekBarPreference" into tm-dev am: 4c07e2b865
am: 9b81fec6a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475669
Change-Id: I0a5f1a4bed9e2fd4d57119e0fb9572c367c9e644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 12:54:03 +00:00
TreeHugger Robot
74c324b70f
Merge "Fix can't start injected item problem" into tm-dev
2022-05-24 12:41:46 +00:00
Edgar Wang
9b81fec6a0
Merge "Fix talkback speak "double tap to activate" on LabeledSeekBarPreference" into tm-dev am: 4c07e2b865
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475669
Change-Id: I93c94eee39fa5ea786632b04498ba99eecc02eec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 12:29:09 +00:00
Edgar Wang
4c07e2b865
Merge "Fix talkback speak "double tap to activate" on LabeledSeekBarPreference" into tm-dev
2022-05-24 12:07:41 +00:00
Binyi Wu
a11ef13497
Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev am: 8fd6873250
am: 2331e4b511
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556457
Change-Id: I2a4608ab2f02f46f700dd3d72843ac301eb096dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 09:44:09 +00:00
Binyi Wu
2331e4b511
Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev am: 8fd6873250
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556457
Change-Id: I513978e2c436055ac1269fd4795d11c48b0ddef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 09:17:12 +00:00
Binyi Wu
8fd6873250
Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev
2022-05-24 08:32:03 +00:00
Arc Wang
03d8d11914
Fix can't start injected item problem
...
Should set highlight Preference key after
isDuplicateClick to ensure clicked Preference
key & highlight Preference are different and
then isDuplicateClick returns a correct value.
Bug: 233553587
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.dashboard
manual
1. Click all left pane items and see if there is any launch problem.
2. Check if duplicate click check works.
Change-Id: Ic6394b96896fd3a0fb926707565f63beff74a27b
2022-05-24 07:13:35 +00:00
TreeHugger Robot
cff52e6aa4
Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev am: d9174aa3cc
am: 9ba22d2ec9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490664
Change-Id: Ia63e588d30bc5d67989d60d7daa272ecc12faacb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 05:14:27 +00:00
Edgar Wang
2b0d9cfc5d
Fix talkback speak "double tap to activate" on LabeledSeekBarPreference
...
- SeekBarPreference should be unselectable
- remove unnecessary handling of Summary
- set currect Title color when preference is enabled and unselectable
Bug: 230553896
Test: robotest
Change-Id: Ie5d819088dc3c435005ddd00e232b2f6992b234a
2022-05-24 05:08:16 +00:00
Binyi Wu
26e5e919c8
Prevent keyboard from blocking the input box for WiFi configuration page.
...
Bug: 223980567
Test: manual
Change-Id: I2b95b065394e2395396ff71b00bd949ac824dac3
2022-05-24 12:50:41 +08:00
TreeHugger Robot
9ba22d2ec9
Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev am: d9174aa3cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490664
Change-Id: I05b01fbce6e6e1dc51cd5bdad2d9fdd0a80bb068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 04:42:47 +00:00
TreeHugger Robot
d9174aa3cc
Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev
2022-05-24 03:51:23 +00:00
Android Build Coastguard Worker
ab146f4e55
Snap for 8632107 from ad5f87709b
to tm-qpr1-release
...
Change-Id: If6b254e1acfcab16f4a2c6eb3b616e2ab71291a0
2022-05-24 01:25:33 +00:00
TreeHugger Robot
9f3f3f02de
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0a367dea1d
-s ours am: 56c0920c7c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: I652cde4bc91c09d8e4809bf472dc29e384ea9068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 01:23:23 +00:00
Bill Yi
19befc3edc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9b665e302
-s ours am: 6adb47ebfa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: I302679597b5d000936ea7f797441f27b480f02cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 01:23:06 +00:00
TreeHugger Robot
56c0920c7c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0a367dea1d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: I037cb6676fd41cb985c7bffcb0bb17535a7270b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 01:00:08 +00:00
Bill Yi
6adb47ebfa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9b665e302
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: I989eaca89d3cb7666d68d5ce2f889fcbdc6ab316
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 00:59:56 +00:00
TreeHugger Robot
0a367dea1d
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-24 00:38:21 +00:00
TreeHugger Robot
ad5f87709b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39043d1ab
-s ours am: 5fdd0b386f
-s ours am: d8e9a267cf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520099
Change-Id: I0274c4685eaf0fcef73571043720fa94c4bcb4fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 20:02:45 +00:00
Bill Yi
962ef907c1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a7ba0f71
-s ours am: 6db82b3062
-s ours am: ea5907aeae
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520099
Change-Id: Ic3eba101c03826d7845d4bd07a35a28e86af491f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 20:02:29 +00:00
TreeHugger Robot
d8e9a267cf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39043d1ab
-s ours am: 5fdd0b386f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520099
Change-Id: I3faca04cf31d63cf8336ee8acab098cb450704f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:44:46 +00:00
Bill Yi
ea5907aeae
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a7ba0f71
-s ours am: 6db82b3062
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520099
Change-Id: I0375c5e00aa7a6a8fef1b96407e624359363908d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:44:30 +00:00
Bill Yi
615d2d7cc4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c0b16955b
-s ours am: d28e552f18
-s ours am: 74bb796c67
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520141
Change-Id: I676ddf11fbdc7542bea2215728e05bd83f94ee50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:35:47 +00:00
TreeHugger Robot
5fdd0b386f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39043d1ab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520099
Change-Id: I12819ca7ba3388a2d3379ba419f489086ca090d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:33:10 +00:00
Bill Yi
6db82b3062
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a7ba0f71
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520099
Change-Id: I09c5bc7d92a8b7c1371d938c219b0cf0d2ebacc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:32:50 +00:00
TreeHugger Robot
6412892a07
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: b3f63399f7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520096
Change-Id: Ia588d05a5c144e7a88189f71fa8b41879ce8fb80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:32:42 +00:00
Bill Yi
affd76cf96
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62a52eccea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520096
Change-Id: I344b4ed43a6ec1bd32ddd067c75d4699e65c0ace
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:32:31 +00:00
Bill Yi
74bb796c67
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c0b16955b
-s ours am: d28e552f18
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520141
Change-Id: I10f818e527b6b9329305a4f4d706210911934c92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:32:30 +00:00
TreeHugger Robot
a62104d2b1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d097fe6e2f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519375
Change-Id: I275ab9e23ac208d886abba0d67b695fcfe2ba05f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:32:14 +00:00
Bill Yi
47937dbd55
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7bc13fac28
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519375
Change-Id: I0fc840e69ad3b0353424a8022922666ed4e1fd77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:31:54 +00:00
Bill Yi
d28e552f18
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c0b16955b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520141
Change-Id: Ie4c9dd453c4b845cdde6abefbf8eb3ddd32c7619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:30:00 +00:00
TreeHugger Robot
b3f63399f7
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-05-23 18:51:30 +00:00
TreeHugger Robot
d097fe6e2f
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-05-23 18:51:30 +00:00
TreeHugger Robot
c07c029ea4
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-05-23 18:50:47 +00:00
TreeHugger Robot
e2ecbcb007
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-05-23 18:50:47 +00:00
TreeHugger Robot
a39043d1ab
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-05-23 18:42:17 +00:00
Tom Hsu
ab7057cb7f
Merge "[Panlingual] Fix icon shall have work badage in work profile." into tm-dev am: 883f5e2572
am: 7a69cee691
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18491260
Change-Id: Ia8b4686e81f5d36c4750ec933c737e5e3b128ea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 17:03:56 +00:00
Tom Hsu
7a69cee691
Merge "[Panlingual] Fix icon shall have work badage in work profile." into tm-dev am: 883f5e2572
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18491260
Change-Id: Ie38b70e0720bda4719f4154456cd4b54672ceb95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 16:38:08 +00:00
Tom Hsu
883f5e2572
Merge "[Panlingual] Fix icon shall have work badage in work profile." into tm-dev
2022-05-23 16:17:54 +00:00
TreeHugger Robot
f0c6b080a3
Merge "Fix crash when operator name contains %" into tm-dev am: 39eb991aa7
am: c59c58e1d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556455
Change-Id: I74d9f38dd22294909ac6a5282e030b74d2093585
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 15:58:56 +00:00
TreeHugger Robot
c59c58e1d3
Merge "Fix crash when operator name contains %" into tm-dev am: 39eb991aa7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556455
Change-Id: I9f1a431164072830f6072a120adbaf125b325e0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 15:32:33 +00:00
TreeHugger Robot
39eb991aa7
Merge "Fix crash when operator name contains %" into tm-dev
2022-05-23 15:16:36 +00:00
SongFerng Wang
266a0ad585
Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4
am: a0553c9d16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556454
Change-Id: I97731177e18ff3aeab109656b7e639bcfa91a0e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 15:07:48 +00:00