Chaohui Wang
6c2ffc2220
Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475672
Change-Id: Ic7dfd8258e5c2d0475d8365a3a4d740dc0f5baf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 14:49:37 +00:00
Chaohui Wang
0d415d7cc6
Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475672
Change-Id: Icdfbe0d9c4dae5cc561c65c01b01414611fa9783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 14:48:03 +00:00
Chaohui Wang
7dc1aec524
Merge "Fix Conversation page flickers" into tm-dev
2022-05-25 14:28:43 +00:00
Chaohui Wang
3c65e9b494
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
am: 1484d1a472
am: f80dea5100
am: 2b99ec0e01
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: Ifdc077c8f7ac1414fe6ee29cef797f765a0b1976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 12:11:58 +00:00
Chaohui Wang
0a719adab1
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
am: 39bd94e1e5
am: 4b8e64c294
am: 1ef0a195ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: I443bfe4e13b80d1c06cb11bab2ca8f465a9582c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 12:11:49 +00:00
Chaohui Wang
faec0bbc14
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
am: 1484d1a472
am: afe4e239ff
am: be86a0934d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: I8d5d06a6600ac730f1d1f9e440f70181e2262b6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 12:11:30 +00:00
Chaohui Wang
2b99ec0e01
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
am: 1484d1a472
am: f80dea5100
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: I911993a05f0240d1d2eb4bb3301b821d92349e8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:52:59 +00:00
Chaohui Wang
1ef0a195ba
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
am: 39bd94e1e5
am: 4b8e64c294
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: I879dcf863993c0eb28b06a7205457ec8842011be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:52:52 +00:00
Chaohui Wang
be86a0934d
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
am: 1484d1a472
am: afe4e239ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: Ic2ca28fd2a3d2b0fdd26fc3f39ae00c52e8083c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:52:29 +00:00
Chaohui Wang
f80dea5100
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
am: 1484d1a472
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: I7021751fd71a049046dd9980d0b3cc50c84cfcde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:35:27 +00:00
Chaohui Wang
afe4e239ff
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
am: 1484d1a472
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: Iad5922b6dc3be89883a2f2281bdda29fd16ac776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:35:24 +00:00
Chaohui Wang
4b8e64c294
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
am: 39bd94e1e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: Ie8392d6d732af7c1197d3cd5ab76900cca836c80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:26:53 +00:00
Chaohui Wang
1484d1a472
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: I51c7156ffdeaecd55464be761cb8d62203e8655d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:09:01 +00:00
Chaohui Wang
39bd94e1e5
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: I4c87be62cf59f3fea0c17c3fb6f5564b0cfa75e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:07:31 +00:00
Chaohui Wang
02314870c7
Merge "Fix SeekBarPreference selectable test" into tm-dev
2022-05-25 10:50:48 +00:00
Automerger Merge Worker
d56caf80bb
Merge "Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
am: 1e410610d8" into tm-d1-dev-plus-aosp am: 934a230278
am: d4a87480fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472
Change-Id: I297da52f23876cb9d215eabe6b7c8115961abe7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 10:36:19 +00:00
Chaohui Wang
b754d0b566
Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
am: 635c506a92
am: 79351944b8
am: 741e3eaeff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472
Change-Id: I36a8b6c046693fbbc8535de40849365787f8b167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 10:35:47 +00:00
Chaohui Wang
0f1debc348
Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
am: 635c506a92
am: 52a4269f9a
am: 6c4476b59f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472
Change-Id: I33fd0a975c68a1dc49c5953986af1a16894c720b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 10:35:12 +00:00
Automerger Merge Worker
d4a87480fe
Merge "Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
am: 1e410610d8" into tm-d1-dev-plus-aosp am: 934a230278
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472
Change-Id: I664d73ee0d1672ef8ab9ee6c549cf9f7ce9f5590
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 10:08:37 +00:00
Chaohui Wang
741e3eaeff
Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
am: 635c506a92
am: 79351944b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472
Change-Id: If9af6f0ff170550845b9380b14cd2064f1c885b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 10:08:02 +00:00
Chaohui Wang
6c4476b59f
Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
am: 635c506a92
am: 52a4269f9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472
Change-Id: Ia81eeb1da4efd3ce5460907e3b2084bd9c9f3894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 10:07:30 +00:00
Automerger Merge Worker
934a230278
Merge "Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
am: 1e410610d8" into tm-d1-dev-plus-aosp
2022-05-25 09:50:04 +00:00
Chaohui Wang
52a4269f9a
Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
am: 635c506a92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472
Change-Id: Id9e665a5efb61b8baa60dce4c2fcaf5703d6897c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 09:49:59 +00:00
Chaohui Wang
79351944b8
Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
am: 635c506a92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472
Change-Id: I804b3ccb98427f3104086a7b237913aba4011bd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 09:49:59 +00:00
Chaohui Wang
3374e43ff7
Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
am: 1e410610d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472
Change-Id: I4d6613dc32980d8958191cd0aa128716430ca407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 09:49:59 +00:00
Chaohui Wang
635c506a92
Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472
Change-Id: Id62102e910aa81346a986551244fb689c74aa0cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 09:32:46 +00:00
Chaohui Wang
1e410610d8
Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472
Change-Id: I6a8942f58c25a773719f4db05a6d44b50a491ccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 09:31:14 +00:00
Weng Su
9bcfba69d9
Merge "Refine carrier Wi-Fi functions" into tm-dev am: 750376ec40
am: 676498649e
am: 410f9d3e6a
am: 75daa00951
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18558087
Change-Id: I64f4c4ef1ca4380baddf89194a744ed8c5c80c51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 09:15:08 +00:00
Weng Su
c2b724f1a5
Merge "Refine carrier Wi-Fi functions" into tm-dev am: 750376ec40
am: 395c675770
am: 3146d2259d
am: 1817b58887
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18558087
Change-Id: I5f0bf1ebea5b5c61445b6a17b87c7925b912a117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 09:14:54 +00:00
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
Chaohui Wang
87f8135959
Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev
2022-05-25 09:13:44 +00:00
Chaohui Wang
968f30a470
Fix SeekBarPreference selectable test
...
SeekBarPreference is set to unselectable in change
Ie5d819088dc3c435005ddd00e232b2f6992b234a
Update the test accordingly.
Bug: 230553896
Test: robotest
Change-Id: Ia024b81e3f8e3808b0bb1e48c41a84d0ececaa85
2022-05-25 16:58:08 +08:00
Weng Su
75daa00951
Merge "Refine carrier Wi-Fi functions" into tm-dev am: 750376ec40
am: 676498649e
am: 410f9d3e6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18558087
Change-Id: Ifbdbc474c222d003c4d12624c9e55dbccbce4ac1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 08:47:00 +00:00
Weng Su
1817b58887
Merge "Refine carrier Wi-Fi functions" into tm-dev am: 750376ec40
am: 395c675770
am: 3146d2259d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18558087
Change-Id: I1993f23652ccdc5f5fc11613971799fb1932e790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 08:46:23 +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
410f9d3e6a
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: I5cc5bfae5e99aec94011c8bb56a8cae9714f3d22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 08:30:19 +00:00
Weng Su
3146d2259d
Merge "Refine carrier Wi-Fi functions" into tm-dev am: 750376ec40
am: 395c675770
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18558087
Change-Id: I65e7ce206f05c3dbdb871b5b793514f758f5ef93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 08:30:01 +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
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