Commit Graph

43155 Commits

Author SHA1 Message Date
SongFerng Wang
f93d0c2bc8 Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f am: 15c33001a2 am: af87b62083
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901

Change-Id: I3ff05011bc5157f82317ab70ba768742bad287a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 07:09:42 +00:00
SongFerng Wang
af87b62083 Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f am: 15c33001a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901

Change-Id: I8bbfbd514c1c667134c3d798e477ea6d3e87faa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 06:55:41 +00:00
SongFerng Wang
15c33001a2 Merge "Changing the condition since the esim may be removable" into tm-dev am: fa5407c60f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579901

Change-Id: If3afab7ab294f3ce2836f96c12ba1d95dd82fbb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 06:41:11 +00:00
SongFerng Wang
fa5407c60f Merge "Changing the condition since the esim may be removable" into tm-dev 2022-05-27 06:23:16 +00:00
Hank Sheng
73f37d3f3a Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa am: 349b36bb91 am: 55e4e5d0e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: I41379defe421d7b41dee13b88a2b67bca951f6d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 06:03:25 +00:00
Chaohui Wang
60dbbc5f9d Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4 am: caabb4fe49 am: 6737a44fba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945

Change-Id: Ib28e234c5b048342bd40a1c5c29cc301de540b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 06:03:17 +00:00
Hank Sheng
55e4e5d0e3 Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa am: 349b36bb91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: Ifcef39885b565fbbdc950fe43c6b26d57e2bdcfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:48:57 +00:00
Chaohui Wang
6737a44fba Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4 am: caabb4fe49
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945

Change-Id: I97d75ae94ed28e05698b516ef7e43d6c638c2b7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:48:18 +00:00
Hank Sheng
349b36bb91 Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: Id2d1766f508dd02f8412131c25f12f82d92a3833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:48:03 +00:00
Hank Sheng
3dfcc708aa Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev 2022-05-27 05:32:47 +00:00
Chaohui Wang
caabb4fe49 Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945

Change-Id: I348919ec56e2f4ba3a28db987b205cddeb44463a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:26:26 +00:00
Chaohui Wang
bc2e0f5fc4 Merge "Fix unable to toggle off Pause app activity" into tm-dev 2022-05-27 04:59:46 +00:00
Tom Hsu
c421f73232 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 806582197e am: 019d251814
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I73a3179f80439761e4af8e1b637d7d9b4341e55d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 16:39:20 +00:00
Tom Hsu
019d251814 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 806582197e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I16eef92f8fca756292ebade85c71601ac273bff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 16:07:36 +00:00
Tom Hsu
806582197e Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I56919305722783a24bd68c0e378cc1d272a6f2aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 15:41:44 +00:00
Tom Hsu
f6ea9c99b3 Merge "Fix wrong summary string show on the network page." into tm-dev 2022-05-26 15:06:00 +00:00
tom hsu
d793e9512d Fix wrong summary string show on the network page.
Bug: 206742805
Test: local test, see b/206742805#4
Change-Id: I4fa9468e4f3b7d3671e383d3203b67636daa416c
2022-05-26 17:41:13 +08:00
Hank Sheng
bdda48ebe5 Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4.
screen shot:
https://hsv.googleplex.com/5487921525161984
https://hsv.googleplex.com/4853914928152576
https://hsv.googleplex.com/6492643191160832
https://hsv.googleplex.com/5915886260060160
https://hsv.googleplex.com/6321050657751040
https://hsv.googleplex.com/6222016362315776

Bug: 233036258
Bug: 233032365
Change-Id: If2bb4a82912bfdd18dc17ced11adc59eaf474bed
2022-05-26 07:17:36 +00:00
SongFerngWang
948f512098 Changing the condition since the esim may be removable
The condition whether the slot is esim slot should use getIsEuicc
api since the esim may be removable.

Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: I47dc068e57a0faa7f7ce85af7933a48caa2c93e4
2022-05-26 10:54:39 +08:00
Chaohui Wang
a64429b8e8 Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524 am: 6c2ffc2220 am: 447f77c07d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475672

Change-Id: Id2ae29ea35605664ecd672efe67252ecf3848924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 15:22:16 +00:00
Chaohui Wang
447f77c07d Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524 am: 6c2ffc2220
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475672

Change-Id: I572044e99da299f73635c6a6008b376bfdca2fed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 15:06:49 +00:00
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
7dc1aec524 Merge "Fix Conversation page flickers" into tm-dev 2022-05-25 14:28:43 +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
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
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
87f8135959 Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev 2022-05-25 09:13:44 +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
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
Chaohui Wang
2af5588692 Fix unable to toggle off Pause app activity
The "Pause app activity if unused" SwitchPreference under App info page.

Currently, the preference controller updates the UI state in the
onOpChanged(), which is unnecessary and is called in another non-UI
thread.

Not updating state in onOpChanged() to fix.

Note: This controller implements the LifecycleObserver to handle
lifecycle related logic, but it's actually a no-op before change
If9e48e44267de8e89a5e8f45d256719130936320. So it used to work fine
without the OnOpChangedListener, we can remove it now.

Fix: 227762370
Test: manual
Change-Id: I33f1f55a706407d7b409c3544f9889c45855b34d
2022-05-25 11:45:23 +08: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
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
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
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