SongFerngWang
18f10bb8b1
[MEP] The removale slot can read the esim card
...
Revert the wrong logic for removale slot part at ag/18579901,
the removable slot can read the esim card.
Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: Ic2ac6a5cc4d5846b8b1e2ca766348f239bb1b719
2022-05-27 16:44:52 +08: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
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
Chaohui Wang
c2dacf1b75
Fix flicker for AppDataUsage when zero usage
...
When the page is entered from the AppInfoDashboardFragment, there is no
way to know whether the cycle data is available before finished the
async loading. If it's zero usage, the cycle spinner will be removed,
which cause a flicker.
Temporarily disable the preference list's animator before initial
page updates can solve this issue.
This also fix another flicker on this page when the background data is
off.
Fix: 233963355
Test: manual visual test
Change-Id: I795ed95e15bb3216fa17adfd4f57faf5fd92fa00
2022-05-27 10:21:17 +08:00
Bill Yi
ff457d8594
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib80c2408db28e4aa45a04109220fc2419fa82a5b
2022-05-26 18:27:20 -07:00
Bill Yi
4fcb08305a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3fa9ddd1fa5829250d7c4fe695278c383c5c91ea
2022-05-26 18:23:46 -07:00
Amy Hsu
7af580d08b
Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: eca20b0820
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603826
Change-Id: I74384b25ead713af83acc06434d57ae3214739fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 00:39:16 +00:00
Amy Hsu
eca20b0820
Merge "[ScreenResolutionController] UI string update" into tm-d1-dev
2022-05-27 00:17:19 +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
Jason Chiu
0c732f2a80
Don't start two pane for singleInstance deep links
...
If the activity's launch mode is "singleInstance", it can't be embedded
in Settings since it will be created in a new task.
Bug: 229371407
Test: adb shell am start -a android.settings.NETWORK_OPERATOR_SETTINGS
Change-Id: I1689d860151182cd9e97d9e4fd65d30a8804a570
2022-05-26 17:47:18 +08: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
Chaohui Wang
3a99f7c370
Fix flicker for AppDataUsagePreference
...
AppDataUsagePreference's title is sometime async loading, which cause
preference height change, which lead to page flicker.
Set a title placeholder before async loading to reduce flicker.
Fix: 187019210
Test: manual visual test
Change-Id: I26df832ab03a04641fd3d6eb678903ff3fe8820a
2022-05-26 17:36:45 +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
Amy Hsu
ea858a6afc
[ScreenResolutionController] UI string update
...
Bug: b/230626771
Test: Check the string manually
Change-Id: Ic5c8ed146297bf1672e18e078aa8389738584cfb
2022-05-26 11:33:52 +08: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
Bill Yi
e75601afb3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526
-s ours am: 6096b86e1a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: I6044a0d84d82198846a20eb10033f221bc2a2a4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:41:02 +00:00
Bill Yi
02cc0fd744
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543
-s ours am: c99eb87613
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: Id204adb945516f0b2bf9b32eef511d41f39987e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:40:55 +00:00
Bill Yi
760d7ac4f9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a
-s ours am: f344101fdb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586094
Change-Id: Ifbe06f18f6da7b3e12066d72f214c64e84ea33ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:40:41 +00:00
Bill Yi
c43c833edf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb
-s ours am: 9b4e0f0e67
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586094
Change-Id: I8000753c531331ff9b855f211e5154c8bcd5cb26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:40:24 +00:00
Bill Yi
6096b86e1a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: I909d66a4cb1412a9e924996fab95e63727a3acb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:06:43 +00:00
Bill Yi
c99eb87613
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: I734c6876008c4eb19d6e7867b3bfe9ec5c56c4cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:06:26 +00:00
Bill Yi
f344101fdb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586094
Change-Id: I611a79eded17b14ff32f4e80df239a70e6eb0f86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:06:13 +00:00
Bill Yi
9b4e0f0e67
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586094
Change-Id: I5c7cec9a49b35cd390c817a66221921095cdbdc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:05:54 +00:00
Bill Yi
b91e43c526
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-25 18:43:37 +00:00
Bill Yi
f4cb74b97a
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-25 18:43:37 +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
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
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
02314870c7
Merge "Fix SeekBarPreference selectable test" into tm-dev
2022-05-25 10:50:48 +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
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
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