Commit Graph

109364 Commits

Author SHA1 Message Date
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
395c675770 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: I2d1d5c15f39a86c93322e07f2f0cf17869a0d41d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 08:09:54 +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
Chaohui Wang
866b79c245 Clean up lifecycle in MobileNetworkSettings
To avoid double registering, which prevent potential issues and could
improve latency.

Since DashboardFragment already supported register lifecycle
automatically for the controllers bound by XML which implements
androidx.lifecycle.Lifecycle, so doing a cleanup to prevent register
lifecycle event manually (doubling).

Bug: 149338098
Test: temporarily add logging to make sure the lifecycle method is
      called and only called once
Change-Id: I4dbc36414991ef6b599be61aa77ff0dc8c52468c
2022-05-25 13:46:55 +08: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
Chaohui Wang
bd369cfee5 Fix Conversation page flickers
In this page, 3 conversation lists are implemented by the
ConversationListPreferenceController, these lists updates its contents
in updateState(), which is after the preference screen view created.
So when the first time this page is showed, animations of added contents
will be shown.

The improvement is when the first time, update the list in the
onCreate(), which is called before view creation, instead of the
updateState().

And also do the same thing for RecentConversationsPreferenceController.

Also, to reduce latency,
1. Because currently there are duplicated calls in
NoConversationsPreferenceController to check whether conversations are
exists or not, by removing the duplicated calls and reuse the result
from other controllers, the latency could be reduced.
2. Currently, there are seperated api calls, the
mBackend.getConversations(false) in AllConversationsPreferenceController
and the mBackend.getConversations(true) in
PriorityConversationsPreferenceController, use one
mBackend.getConversations(false) in ConversationListSettings to improve,
this does not change the behavior because the result is filtered in
matchesFilter() both before and after.
3. Currently, we sort conversations first then filter them, change to
filter first then sort to reduce latency.

Fix: 215073227
Test: visual check & robo tests
Change-Id: I028a7fabbbf64cf5627e6615372282a36eb784e5
2022-05-25 10:43:16 +08:00
Daniel Chapin
6113efdebf Merge "Fix crash for DefaultSubscriptionController" into tm-dev am: fa878f2f26 am: 1c432c5a1e am: c9f528ee23 am: 408aaf5528
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18573290

Change-Id: Id43095b2db3ac8f0881c4353d6bb819006b72653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 01:47:58 +00:00
Daniel Chapin
c2f4af892a Merge "Fix crash for DefaultSubscriptionController" into tm-dev am: fa878f2f26 am: 61ffcb9b61 am: 82ed2bc190 am: be61f61913
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18573290

Change-Id: Ia3848be2a7ebf110c623fe3d0bad338e58b04d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 01:47:43 +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
408aaf5528 Merge "Fix crash for DefaultSubscriptionController" into tm-dev am: fa878f2f26 am: 1c432c5a1e am: c9f528ee23
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18573290

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

Change-Id: Id5c039e039315e3b62204b0e3a26db8072aef991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 01:28:43 +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
82ed2bc190 Merge "Fix crash for DefaultSubscriptionController" into tm-dev am: fa878f2f26 am: 61ffcb9b61
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18573290

Change-Id: I7a9feb3c1ca919dd615ca6475c32e1086ba353fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 01:11:33 +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
61ffcb9b61 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: Id94e14072b159e13ae5d42f3c6aded5c8fae8404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 00:41:38 +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
7a0d268d7a Merge "Fix can't start injected item problem" into tm-dev am: 74c324b70f am: 19589d5bb4 am: 84c8dd38e6 am: df8a5c2054
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18570252

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

Change-Id: I589dbebdea1616c6d81b2d68a7166c0ecd358e0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 14:11:58 +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
df8a5c2054 Merge "Fix can't start injected item problem" into tm-dev am: 74c324b70f am: 19589d5bb4 am: 84c8dd38e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18570252

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

Change-Id: I2a3e1b8ab1054a063257336fccb51e7bb9ddd681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 13:53:15 +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
Edgar Wang
72679be8c1 Merge "Fix talkback speak "double tap to activate" on LabeledSeekBarPreference" into tm-dev am: 4c07e2b865 am: 9b81fec6a0 am: 8f75078181 am: cd6bdab55a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475669

Change-Id: I58bacca56396f90475d3437986b84063696b75d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 13:38:00 +00:00
TreeHugger Robot
84c8dd38e6 Merge "Fix can't start injected item problem" into tm-dev am: 74c324b70f am: 19589d5bb4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18570252

Change-Id: I7e94225cdf291655074e87a2bef8b70b3d65a8fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 13:37:56 +00:00
Edgar Wang
0b9fa34db3 Merge "Fix talkback speak "double tap to activate" on LabeledSeekBarPreference" into tm-dev am: 4c07e2b865 am: 9b81fec6a0 am: 356ddd45ac am: 9a73244c69
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475669

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

Change-Id: I16dd9aeb44cc87a198fa39fe7a19dec286e91140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 13:11:00 +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
9a73244c69 Merge "Fix talkback speak "double tap to activate" on LabeledSeekBarPreference" into tm-dev am: 4c07e2b865 am: 9b81fec6a0 am: 356ddd45ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475669

Change-Id: If1d65a23567f404807d45520cdd5f829a7587565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 13:01:55 +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
TreeHugger Robot
19589d5bb4 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: Ie40e649eb7e9ffd0859a0bd3af839bc7d647146f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 13:01:26 +00:00
Edgar Wang
356ddd45ac 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: I17f8d143eaedb2f9e2303d1c1460132e53cb6abc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 12:54: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
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
Binyi Wu
af86532e76 Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev am: 8fd6873250 am: 2331e4b511 am: 311e40ce4b am: c602a9e36a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556457

Change-Id: I3857b1ffb8b658a12df541b81ef52b0e99ec0785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 11:21:50 +00:00
Binyi Wu
dba2183b15 Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev am: 8fd6873250 am: 3ea7d18309 am: 7c5f75c221 am: e296e407f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556457

Change-Id: I37d5439e249b2b7fcf9f5d390ef6c6cb4a72b27a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 11:21:39 +00:00