Commit Graph

43723 Commits

Author SHA1 Message Date
Weng Su
17d162c8b5 Merge "Refine carrier Wi-Fi functions" into tm-dev am: 750376ec40 am: 676498649e am: 42b9b5dcb4 am: 25a3f4177c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18558087

Change-Id: I4cb1d770785f68e25f91fb8e886426344eeea8d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 09:14:35 +00:00
Weng Su
25a3f4177c Merge "Refine carrier Wi-Fi functions" into tm-dev am: 750376ec40 am: 676498649e am: 42b9b5dcb4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18558087

Change-Id: I4b28504100bf37eba2716b8b8c5a356d98c8481d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 08:46:03 +00:00
Weng Su
42b9b5dcb4 Merge "Refine carrier Wi-Fi functions" into tm-dev am: 750376ec40 am: 676498649e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18558087

Change-Id: I1c9d689766db4e15c2076eec53546aa16c3c5e4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 08:30:19 +00:00
Weng Su
676498649e Merge "Refine carrier Wi-Fi functions" into tm-dev am: 750376ec40
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18558087

Change-Id: I5fc1cd3176b7ba042d32e46e2fd94b2b3331c707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 08:11:40 +00:00
Weng Su
750376ec40 Merge "Refine carrier Wi-Fi functions" into tm-dev 2022-05-25 07:50:35 +00:00
TreeHugger Robot
81618d155e Merge "Add owner to the vpn folder" 2022-05-25 06:45:08 +00:00
Hugh Chen
391e0e2576 Merge "Make VPN by Google One always appear in VPN settings" 2022-05-25 05:06:56 +00:00
Hugh Chen
50897cb960 Add owner to the vpn folder
Bug: 233559781
Test: manually test
Change-Id: Id4bb1ba5dc857d8c5835fabaac059c65ee0552b6
2022-05-25 03:33:45 +00:00
Daniel Chapin
c9e77368f0 Merge "Fix crash for DefaultSubscriptionController" into tm-dev am: fa878f2f26 am: 1c432c5a1e am: 3a1eb1da63 am: 9777c5af1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18573290

Change-Id: I9bfc1736c04bbd71861c218a44bba356c45edc94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 01:47:25 +00:00
Daniel Chapin
9777c5af1d Merge "Fix crash for DefaultSubscriptionController" into tm-dev am: fa878f2f26 am: 1c432c5a1e am: 3a1eb1da63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18573290

Change-Id: I4917d4ef63d24c7d3376c76df6ed12afd443d6ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 01:28:22 +00:00
Daniel Chapin
c9f528ee23 Merge "Fix crash for DefaultSubscriptionController" into tm-dev am: fa878f2f26 am: 1c432c5a1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18573290

Change-Id: I19104ea6d4e700de7314cd5f9eddd9be5aa6a315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 01:11:30 +00:00
Daniel Chapin
3a1eb1da63 Merge "Fix crash for DefaultSubscriptionController" into tm-dev am: fa878f2f26 am: 1c432c5a1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18573290

Change-Id: I3651532bb9ec4d60c4cf1b51ebd4447d8728fe04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 01:11:20 +00:00
Daniel Chapin
1c432c5a1e Merge "Fix crash for DefaultSubscriptionController" into tm-dev am: fa878f2f26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18573290

Change-Id: I6f97b69e20648341043bbdfff4e8d28ca62b7d73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 00:43:16 +00:00
Daniel Chapin
fa878f2f26 Merge "Fix crash for DefaultSubscriptionController" into tm-dev 2022-05-25 00:22:04 +00:00
Chaohui Wang
2e34038233 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
2022-05-24 16:51:51 +00:00
TreeHugger Robot
be06173c8f Merge "Fix can't start injected item problem" into tm-dev am: 74c324b70f am: 0dc5eff113 am: efb1a9e43d am: 2b73c89426
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18570252

Change-Id: I51fe4e57d7600c6a232b82b73d1f7efbfbb06090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 14:11:35 +00:00
TreeHugger Robot
2b73c89426 Merge "Fix can't start injected item problem" into tm-dev am: 74c324b70f am: 0dc5eff113 am: efb1a9e43d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18570252

Change-Id: I575ef6746916b07628bd6f7d43ac7f33ac8637c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 13:52:44 +00:00
TreeHugger Robot
d8216ec3d5 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: Ica7fc11c05ff72f5fd8ba566cf2be39e77225c8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 13:37:46 +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
Edgar Wang
fc81123555 Merge "Fix talkback speak "double tap to activate" on LabeledSeekBarPreference" into tm-dev am: 4c07e2b865 am: 0c461ec850 am: 73f218bd81 am: caaf1d83f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475669

Change-Id: I3af68321af5896e8e34c9dcae656b30f0cabcd9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 13:37:36 +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
caaf1d83f2 Merge "Fix talkback speak "double tap to activate" on LabeledSeekBarPreference" into tm-dev am: 4c07e2b865 am: 0c461ec850 am: 73f218bd81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475669

Change-Id: Id1c120a3d5dd5796ebd952dcb71a18cbfb297ac1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 13:01:37 +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
Edgar Wang
73f218bd81 Merge "Fix talkback speak "double tap to activate" on LabeledSeekBarPreference" into tm-dev am: 4c07e2b865 am: 0c461ec850
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475669

Change-Id: I33097744676c47efd61fe8eb242cddf0a9843e11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 12:45:28 +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
0c461ec850 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: I38b97fd064bfaddde409a6c9bffc5a10d4dc9e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 12:27:34 +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
Victor Chang
0933addd0e Merge "Reland "Don't use framework strings for formatting file sizes"" am: ba69fd0d3f am: d5ab7dc729 am: 5aada33242 am: 330934cfb5 am: 200c45a9fe
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2096605

Change-Id: Ic945ada7d520a4ec53dccef4e30918f140cb63cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 11:43:19 +00:00
Victor Chang
200c45a9fe Merge "Reland "Don't use framework strings for formatting file sizes"" am: ba69fd0d3f am: d5ab7dc729 am: 5aada33242 am: 330934cfb5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2096605

Change-Id: I51f6f771dd9a791c3dcc5465bff9e426d649f5ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 11:38:30 +00:00
Victor Chang
330934cfb5 Merge "Reland "Don't use framework strings for formatting file sizes"" am: ba69fd0d3f am: d5ab7dc729 am: 5aada33242
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2096605

Change-Id: I7208109922af4f7e2bf7aa67e4ee599164eff16c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 11:29:37 +00:00
Victor Chang
5aada33242 Merge "Reland "Don't use framework strings for formatting file sizes"" am: ba69fd0d3f am: d5ab7dc729
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2096605

Change-Id: I8b616af8d02a6d984d7dbec2b50087242958dd40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 11:20:54 +00:00
Binyi Wu
3a49fae347 Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev am: 8fd6873250 am: 2331e4b511 am: a11ef13497 am: cdbcb31c58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556457

Change-Id: Ie30ec470239bea0acde5adc8949c16345ef2bd48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 11:20:41 +00:00
Victor Chang
d5ab7dc729 Merge "Reland "Don't use framework strings for formatting file sizes"" am: ba69fd0d3f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2096605

Change-Id: Ib0ad04ef4c225fbc449abed9913381d6c8d3a138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 10:53:20 +00:00
Binyi Wu
cdbcb31c58 Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev am: 8fd6873250 am: 2331e4b511 am: a11ef13497
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556457

Change-Id: I4e8f7f008a9dca0386e820f4d01116b703ae58e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 10:52:17 +00:00
Hugh Chen
75b75d446c Make VPN by Google One always appear in VPN settings
Bug: 233559781
Test: manually test
Change-Id: I175ab126ff92f773ab25a1fa64e4262b324fd353
2022-05-24 10:09:19 +00:00
Victor Chang
ba69fd0d3f Merge "Reland "Don't use framework strings for formatting file sizes"" 2022-05-24 10:04:46 +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
7c5f75c221 Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev am: 8fd6873250 am: 3ea7d18309
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556457

Change-Id: I6e8a23ab2074f976b646ac46cefee5e8fd725fbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 09:44:08 +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
3ea7d18309 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: Ice082991ab8157716aa910ee15ad2c7fa8096086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 09:15:28 +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
a69c622dbe Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev am: d9174aa3cc am: 9ba22d2ec9 am: eb9df278da am: ad7057c70b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490664

Change-Id: Ifffed5848e96d5aa05a7e8d948f45fe202830af1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 06:13:23 +00:00
TreeHugger Robot
ad7057c70b Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev am: d9174aa3cc am: 9ba22d2ec9 am: eb9df278da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490664

Change-Id: Idb1a3ca83695f791858d5974e4b5425f5ff39f7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 05:33:14 +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
TreeHugger Robot
eb9df278da 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: I3498483e5e73d28151b5ac151ca05b2f375f9333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 05:14:06 +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