Commit Graph

2314 Commits

Author SHA1 Message Date
Weng Su
ef2fd5b7cd [RESTRICT AUTOMERGE] Restrict ApnEditor settings
- Finish ApnEditor settings if user is not an admin

- Finish ApnEditor settings if user has DISALLOW_CONFIG_MOBILE_NETWORKS restriction

Bug: 279902472
Test: manual test
atest -c ApnEditorTest

Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
Merged-In: I5cf984000244b4ad901c6a4977a1368279323e0a
2023-07-12 06:46:21 +00:00
SongFerngWang
286dce6b6e [MEP] Hide the preferred SIM dialog when the user has replaced the SIM
Since there is the race condition and it causes UI hides the preferred
SIM dialog. Therefore, to hide the preferred SIM dialog under the
specific condition which the user has replaced the SIM during the
SIM switching.

Bug: 238061853
Test: Manually testing. Device has the psim+esim and the esim's mobile
data on. The tester disables the esim and then UI shows the preferred
SIM dialog.

Change-Id: I01e7d60170c5053730fd3113abd914fb5c0d11c9
2022-07-07 08:39:03 +00:00
Bonian Chen
c5fc5db0e7 Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev 2022-06-23 04:08:21 +00:00
Bonian Chen
29a00dbc31 Merge "[Settings] Adjusted the API of Settings app" into tm-dev 2022-06-22 18:59:54 +00:00
Bonian Chen
d10618d489 [Settings] Adjusted the API of Settings app
The API of Settings app get changed in order to support large screen.
This is a fix to adopt the change related to this work.

A short brief:
1. Accept ACTION_MAIN for launching MobileNetworkActivity.
2. Support deep-link intent while MobileNetworkActivity in foreground.
3. Avoid from binding MobileNetworkActivity as a single instance.

Bug: 230047450
Bug: 234406562
Bug: 229371407
Test: local & unittest
Change-Id: Ifcb9d4c564839199d998bd503f390f021c6bf3ad
2022-06-22 07:51:47 +08:00
SongFerngWang
5a4df243f0 Fix the NullPointException
The subscriptionInfo.getCarrierName may be a null, so adding the null
checking.

Bug: 236064286
Test: build pass
Change-Id: I8f6f5ac725d6dd552ac2626725e44f52dcbf6c32
2022-06-16 10:46:07 +08:00
Bonian Chen
03da62810c [Settings] Avoid from close dialog when touch outside.
Roaming confirmation dialog might get closed when touch outside,
which is easily been triggered when having a large screen.

Solution: avoid from close dialog when touch outside of dialog area.

Bug: 235183999
Test: local
Change-Id: Ic312d80e6f04cb8f323ebc713eef4e15257de358
2022-06-13 20:55:32 +08:00
SongFerngWang
64430ba2d2 Unable to enable the removable esim
When the user enable the removable esim, the settings select wrong
slot(esim slot). The slot shold be the removable + esim slot and the
UiccCardInfo's cardId is the same as the removable esim's cardId.

Bug: 233170453
Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: Ibd324b781c84318c994e3742bb82e1d1393b94e4
2022-06-06 17:56:25 +08:00
SongFerng Wang
a67d5e25a3 Merge "[MEP] The removale slot can read the esim card" into tm-dev 2022-05-27 14:58:43 +00:00
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
fa5407c60f Merge "Changing the condition since the esim may be removable" into tm-dev 2022-05-27 06:23:16 +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
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
87f8135959 Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev 2022-05-25 09:13:44 +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
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
Weng Su
77f9cbe315 Refine carrier Wi-Fi functions
- Sync the same design to query and set carrier Wi-Fi enabled status from MergedCarrierEntry

- Add more logs for issue tracking

Bug: 227236604
Test: manual test
atest -c CarrierWifiTogglePreferenceControllerTest \
         WifiPickerTrackerHelperTest

Change-Id: I869fa97bd24ed31a3224b4a395ffc97a17aa1471
2022-05-24 03:16:36 +08:00
Chaohui Wang
02eb0aa980 Fix crash when operator name contains %
Currently, cannot use ListPreference.setSummary() when the summary
contains user generated string, because ListPreference.getSummary() is
using String.format() to format the summary when the summary is set by
ListPreference.setSummary().

Use preference.setSummaryProvider() instead, which is recommended for
ListPreference.

Fix: 233295254
Test: manual
Change-Id: Ia24d88817c99db7ed3fc264dbc9c10e0a09d8a39
2022-05-23 19:02:20 +08:00
TreeHugger Robot
f16c90f91d Merge "Show mobile data icon with carrier Wi-Fi level in Settings" into tm-dev 2022-05-20 11:21:18 +00:00
Weng Su
f8f2d17b66 Show mobile data icon with carrier Wi-Fi level in Settings
- If carrier Wi-Fi is active then use carrier Wi-Fi level instead of
  mobile data level.

- If carrier Wi-Fi level is less than min-level, use min-level instead.

Bug: 222885558
Test: manual test
atest -c SubscriptionsPreferenceControllerTest \
         WifiPickerTrackerHelperTest

Change-Id: I46ba5129357bae47e5e44dcbbb26e6673581fdc8
2022-05-20 16:02:47 +08:00
SongFerngWang
7de5f99847 The settings crash when it add the RTL mark on MEP message
The MEP message string is one line, so it did not need to add more
RTL marks.
hsv: https://hsv.googleplex.com/5694452275347456

Bug: 233082642
Test: manually test and take the hsv.
Change-Id: Iad4d469eb6a74805f3c8d5fe5c7eacea1e7a25d3
2022-05-20 12:15:06 +08:00
Bonian Chen
08b7f53383 Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev 2022-05-19 10:28:21 +00:00
Bonian Chen
fa6c9f3a53 [Settings] Stop network mode query when changing config
Changing the configuration of network mode could take a long time.
In some cases, it blocks the query operation.
This is a change to stop query operation from execution during the time
when configuration is changing.

Bug: 227431634
Test: local
Change-Id: Ifeb16e7e9a0ec3de970fe588a1cce6d31fbba9cd
2022-05-17 15:25:12 +00:00
Bonian Chen
61a85eaee7 [Settings] Select RAT in between SIMs for Internet
The internet page RAT need to be selected based on default data SIM.

Bug: 230190055
Test: local
Change-Id: I87edd7a9ddadf877b9cc0c678e3bba423666125e
2022-05-17 18:40:06 +08:00
Chaohui Wang
b7cb887f8e Fix Change link is not clickable in Internet
Links are not allowed in footer preference title now.

So splitting the string in to title text and change text to fix.

Fix: 232481379
Test: manual test
Change-Id: I857b33ac06ec2fb9619da94a2947dbc25f5b28db
2022-05-13 13:22:23 +08:00
SongFerng Wang
55ded566e3 Merge "stop show preferred SIM card dialog during sim switch" into tm-dev 2022-05-11 11:17:28 +00:00
Bonian Chen
812de51467 Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev 2022-05-10 12:35:30 +00:00
SongFerng Wang
b1613b210d Merge "Reuse the active esim slot" into tm-dev 2022-05-10 06:25:07 +00:00
SongFerngWang
c389149ff3 stop show preferred SIM card dialog during sim switch
Bug: 227169390
Test: manually test
Change-Id: I242402e49b267c8cd61a85a46367c778d2d8bbf8
2022-05-10 11:54:44 +08:00
Bonian Chen
bd971968e9 Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev 2022-05-10 02:25:51 +00:00
Bonian Chen
8b06c96fe9 [Settings] Hide some Preference entries when no mobile data support
Hide some Preference which requires mobile data on device didn't support
it.

Bug: 221999174
Test: local
Change-Id: I7dd6e13aea0ed4467c7c7edeada564e42ea78349
2022-05-10 01:12:23 +00:00
Bonian Chen
e0f1081739 [Settings] IMS feature checking before accessing VT IMS API
Check IMS feature before accessing VT IMS API.o

Bug: 231248315
Test: local
Change-Id: I01b438cc79bb91ca05ba6bf57c7e38eb06e51a98
2022-05-10 01:32:31 +08:00
SongFerngWang
42aa247383 Reuse the active esim slot
If there is the active esim slot in SS mode, the settings should
reuse it and does not change the sim slot mapping.

Bug: 229803628
Test: manually test.
Change-Id: I6daa38f54abfaf67c7640d9dc8be0da02eb59554
2022-05-10 01:04:20 +08:00
TreeHugger Robot
2e6d03d0f4 Merge "Remove Wi-Fi toggle in settings search" into tm-dev 2022-05-04 15:51:34 +00:00
Weng Su
9dfbd9dab8 Remove Wi-Fi toggle in settings search
- Remove Wi-Fi toggle preferences in settings search if Wi-Fi state is disallowed to change

- See the result screenshot in b/203168097#comment29

Bug: 203168097
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Ibe352f3ec3413fb0774de0b2bd213bb705e919e0
2022-05-04 04:01:47 +08:00
Bonian Chen
e83d2a5e0e Merge "[Settings] Fix missing part for refactor" into tm-dev 2022-05-03 12:33:36 +00:00
Bonian Chen
55d722c2b0 Merge "[Settings] Preferred network mode appears during in-call" into tm-dev 2022-05-03 09:46:47 +00:00
Bonian Chen
eff476375c [Settings] Fix missing part for refactor
There're 2 missing parts in previous code refactor:
1. The API change for exiting ECM mode dialog
2. The support of onActivityResult() for PreferenceController

Bug: 226494641
Test: local
Change-Id: I0c2c313a53fbc1b7435f295f190b70653e2f6758
2022-05-03 07:33:48 +00:00
Bonian Chen
382d27f9c7 [Settings] Preferred network mode appears during in-call
Preferred networko mode should only presented when allowed.

Bug: 225291570
Test: local
Change-Id: I22edf0f6176a5bd3de12604895d9b14c3b015795
2022-05-02 20:19:02 +08:00
Bonian Chen
ec3264f831 [Settings] Stop listening data connected intent for presenting reset APN dialog
Suspening the monitering of intent(TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED)
during the stage of resetting default APN, since its more like a noice
once the reset progress stared (since user pressed the menu button).

Bug: 190127964
Test: local
Change-Id: I524fb4a3b06b50706556b8e68cb36dc5efbd9a07
2022-05-01 15:28:42 +08:00
Bonian Chen
7bdf717410 Merge "[Settings] Rename title of SIM UI when changed" into tm-dev 2022-04-29 15:59:32 +00:00
Bonian Chen
ba943c9b94 [Settings] Rename title of SIM UI when changed
Title of subscription page should align with the SIM card.

Bug: 230308627
Test: local
Change-Id: Iab9ba25ac8c3faf7d37f97c8f3f3488cbaa2e228
2022-04-29 09:10:47 +00:00
Bonian Chen
783314ae4f Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev 2022-04-28 11:05:42 +00:00
Bonian Chen
b92156c03e Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev 2022-04-27 15:57:30 +00:00
TreeHugger Robot
c28169adb9 Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev 2022-04-27 05:56:10 +00:00
Bonian Chen
8789731cde Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"
This reverts commit 81d230b250.

Reason for revert: merge failure in other branches

Change-Id: If8661f5f321f22df96aab54eb8ba967c232348ac
2022-04-27 05:13:30 +00:00
Bonian Chen
4e32727c01 [Settings] Link to incorrect SIM after SIM swap
A click to the UI presented on screen should take user to the exact SIM
that clicked instead of the first SIM presented to the end user (and
could no longer available).

Bug: 227273792
Test: local
Change-Id: If5a33f72e5730911af61f20a6a45a40cafb956d0
2022-04-27 08:55:45 +08:00
Bonian Chen
3bddc056d8 Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"
This reverts commit aeac0619df.

Reason for revert: merge failure in other branches

Change-Id: I601e674be41fc5d4c97bd8db54ab1982377455f1
2022-04-27 00:03:20 +00:00