Commit Graph

1698 Commits

Author SHA1 Message Date
Jiashen Wang
ea5ef92219 Merge "[SIM Dialog Migration] Enable SIM operation dialog in Settings" 2020-12-07 18:31:02 +00:00
Jiashen Wang
9c14ca798a Merge "Fix the dialog presist issue after toggling pSIM" 2020-12-07 18:30:44 +00:00
Xin Li
07ccb42665 DO NOT MERGE - Merge RQ1A.201205.011
Bug: 172690556
Merged-In: I3f7d41c196569c0cb61e89cfc270b957e2f0add5
Change-Id: Id2d9c4f56beae280e6299b6695185577a1521345
2020-12-07 00:39:43 -08:00
Weng Su
cdb843d932 Merge "[Provider Model] Add Airplane-safe networks slice" 2020-12-07 06:23:55 +00:00
Jiashen Wang
8271561a76 [SIM Dialog Migration] Enable SIM operation dialog in Settings
Change Settings to not call SubscriptionManager#setSubscriptionEnabled.
Instead, make Settings call EuiccManager APIs directly.
Design: https://docs.google.com/document/d/1wb5_hoBkZVbkXGNWHbx4Jf61swjfxsJzkytiTzJosYo/edit?usp=sharing
Bug: 160819390
Test: Manually tested eSIM profile enabling.

Change-Id: I56bbcbb9ccb886b0f9249e67c5a6a6444bb7dd45
2020-12-05 21:48:09 -08:00
Jiashen Wang
74614a2865 Fix the dialog presist issue after toggling pSIM
Bug: 170507290
Test: Manually tested it.
Change-Id: I202ff83bfa72d998ba70774d1998bc827b1b0c8e
2020-12-04 15:32:06 -08:00
Weng Su
6c430b370d [Provider Model] Modify the class name to GenericSwitchController
- The generic class can be used for multiple controllers

Bug: 174022082
Test:
- atest -c AirplaneSafeNetworksPreferenceControllerTest
- make RunSettingsRoboTests
ROBOTEST_FILTER=AllInOneTetherPreferenceControllerTest
- make RunSettingsRoboTests
ROBOTEST_FILTER=AutomaticStorageManagementSwitchPreferenceControllerTest
- make RunSettingsRoboTests
ROBOTEST_FILTER=WifiPrimarySwitchPreferenceControllerTest

Change-Id: I7d50ae3e6228005eb6dfb0a6c1a2f870c41330f2
2020-12-03 17:40:37 +00:00
Weng Su
96af1674f8 [Provider Model] Add Airplane-safe networks slice
- Hide slice when Airplane Mode is off

- Show slice when Airplane Mode is on
  - Show "View airplane-safe networks" when Wi-Fi is disabled
  - Show "Turn off Airplane Mode" when Wi-Fi is enabled

- Tap "View airplane-safe networks" will set Wi-Fi enabled

- Tap "Turn off Airplane Mode" will set airplane Mode off

- Plan to update the slice to Button style in next cl

- Screenshot
  https://screenshot.googleplex.com/7wHoqvTjaScHXVm

Bug: 173413889
Test:
- atest -c AirplaneSafeNetworksSliceTest
- adb shell am start -a
android.settings.panel.action.INTERNET_CONNECTIVITY

Change-Id: Idcd70348728db2da91582697aaeb4bbf4da117c6
2020-12-03 13:29:56 +00:00
Xin Li
cec81e3030 Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855
Bug: 172690556
Merged-In: Iafcefc2aa64cf3c50b1d139ec0204a315be29da7
Change-Id: I5d4e70fe723d890b5694c3490d6ec841b1ac596e
2020-12-02 00:29:15 -08:00
Jiashen Wang
7629de08dd [SIM Dialog Migration] Sending push notification after DSDS reboot
After DSDS reboot, send a push notification to users for SIM
configration.

Design: https://docs.google.com/document/d/1wb5_hoBkZVbkXGNWHbx4Jf61swjfxsJzkytiTzJosYo/edit?usp=sharing
Bug: 160819390
Test: Manually tested eSIM profile enabling.
Change-Id: Ic0bf2e356bf208d16e2c5a9a380e542fcb8f2b1e
2020-11-30 20:47:39 -08:00
Tom Hsu
011aeced5b Merge "Internet Picker implementation." 2020-11-30 03:01:09 +00:00
Weng Su
b263d3a136 Merge "[Provider Model] Add Airplane-safe Networks preference" 2020-11-30 02:14:34 +00:00
Weng Su
845db3499d [Provider Model] Add Airplane-safe Networks preference
- Hide the preference when airplane mode is off.

- Reuse PrimarySwitchPreference for RestrictedSwitchPreference

- Screenshot
  https://screenshot.googleplex.com/8HiC5sc8xaqnhz5

Bug: 174022082
Test: atest -c AirplaneSafeNetworksPreferenceControllerTest
Change-Id: I06a56e8e815778cebf200c4a486c414e92f4cb87
2020-11-28 16:22:10 +00:00
tom hsu
95b1d7cbbd Internet Picker implementation.
This version is to resolve the Reverted CL, ag/13127781
and make NetworkProviderSettingsTest passed

 Show mobile network on internet page

 With mobile network
  - https://screenshot.googleplex.com/7HzGhnbpitErynY

 Without mobile network
  - https://screenshot.googleplex.com/8sNVggTpKEhKeRh

Class diff: https://diff.googleplex.com/#key=WosyTF0ANVMf

Doc: https://docs.google.com/presentation/d/1azrZVS54pxM2lt9LkZHtFh_6W3fyDw_kTTPVQ_mJCi4/edit#slide=id.g9c7123c172_0_448

Bug: 173105859
Test: atest NetworkMobileProviderControllerTest passed
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SubscriptionsPreferenceControllerTest passed
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest passed

Change-Id: Ib0bdd148424881353f18307cb83798b4217060fc
2020-11-27 14:20:03 +00:00
TreeHugger Robot
caec49117e Merge "Revert "[Provider Model] Internet Picker implementation."" 2020-11-26 09:41:09 +00:00
Bonian Chen
69a79dda66 Merge "[Settings] Reduce the operation of VoLTE config redraw" am: 967311df7f am: d9ba9cf45b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1510918

Change-Id: I7e23c867d495ae670c975f1f2c8d54fd71ddfeb0
2020-11-26 08:40:23 +00:00
Bonian Chen
fc69b02cde Merge "[Settings] Add voice call status and VoLTE mode detection into VoLTE UI test case" am: 3c934b2859 am: 80a69cb5e0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1510917

Change-Id: Iaa5acc6cfdd34acf82c0b20b6016f30963c7b737
2020-11-26 08:40:08 +00:00
Bonian Chen
967311df7f Merge "[Settings] Reduce the operation of VoLTE config redraw" 2020-11-26 07:35:21 +00:00
Jason Chiu
ec3d482884 Revert "[Provider Model] Internet Picker implementation."
This reverts commit 329d753a29.

Reason for revert: Broken tests on NetworkProviderSettingsTest

Bug: 174285440
Change-Id: I47e6a9479559cb424bd4b8ac0e967f013f2fba86
2020-11-26 07:05:00 +00:00
Bonian Chen
f9256b41f2 [Settings] Reduce the operation of VoLTE config redraw
There're 3 VoLTE configuration UIs sharing the same configuration,
but only 1 of them will be displayed.

The 3 classes extending Enhanced4gBasePreferenceController are:
1. Enhanced4gAdvancedCallingPreferenceController
2. Enhanced4gCallingPreferenceController
3. Enhanced4gLtePreferenceController
They're different in the value of getMode().

The design within Enhanced4gBasePreferenceController only allows to show one of them.
Which means, the other two don't need to register for PhoneStateListener and should ignore actions in response to it when receiving callback from PhoneStateListener.

Through detecting the VoLTE configuration mode, some operations could be
avoided.
This fix is targeting to avoid these operations from happening.

Bug: 172987488
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Merged-In: I56d4900b5bcb189693c99e870b013da97ed283db
(cherry picked from commit d2e22f4cee)
Change-Id: I92e4b84b81622548fb356a4c7af99668bd2a9e00
2020-11-26 14:18:25 +08:00
Bonian Chen
9769677a3c [Settings] Add voice call status and VoLTE mode detection into VoLTE UI test case
1. VoLTE UI should gray out during voice call.
2. UI should be invisible when VoLTE mode mismatch.

Bug: 172781455
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Merged-In: I8b6a212dc727f1ab78f4dd280cb41966b7054180
(cherry picked from commit 227329b2f7)
Change-Id: I1bd239b6434038323a0689e2bc3bf05182bfcd45
2020-11-26 13:52:47 +08:00
Tom Hsu
ffd1ed3e8b Merge "[Provider Model] Internet Picker implementation." 2020-11-26 02:38:33 +00:00
Bonian Chen
0bff334632 [Settings] init UI entry for Cross SIM calling
Create an empty UI entry for Cross SIM calling.

TODO: fill-in implementation based on UI within document.

Document:
https://docs.google.com/document/d/1INEwrq5_M62hJcRMshdO0OaFruVR0goYByxdpMdFr_o/edit?disco=AAAAHQo7ang&ts=5fadc9b4&usp_dm=true#heading=h.8gw4a7e503pz

Bug: 174012397
Test: manual
Change-Id: I344a18954924c4665295ef244bfee773f3f98d55
2020-11-25 15:51:08 +00:00
tom hsu
329d753a29 [Provider Model] Internet Picker implementation.
Show mobile network on internet page

 With mobile network
  - https://screenshot.googleplex.com/7HzGhnbpitErynY

 Without mobile network
  - https://screenshot.googleplex.com/8sNVggTpKEhKeRh

Class diff: https://diff.googleplex.com/#key=WosyTF0ANVMf

Doc: https://docs.google.com/presentation/d/1azrZVS54pxM2lt9LkZHtFh_6W3fyDw_kTTPVQ_mJCi4/edit#slide=id.g9c7123c172_0_448

Bug: 173105859
Test: atest NetworkMobileProviderControllerTest passed
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SubscriptionsPreferenceControllerTest passed

Change-Id: I9671a0b85aad1dd2f53772539505b0ad96edbda3
2020-11-23 15:55:40 +08:00
Zoey Chen
61ea59ab30 [Provider Model] Implement Calls & SMS fragment test case
New test case: NetworkProviderCallsSmsFragmentTest
Modify the key of preference

Bug: 172053880
Test: manual & atest -c NetworkProviderCallsSmsFragmentTest
Change-Id: I218aaf1194898e70b2118428c1ea5a389d85d036
2020-11-21 00:06:47 +08:00
Zoey Chen
794306c6cb [Provider Model] Implement Calls & SMS fragment
It a whole new fragment that show calls preference, sms preference and Wi-Fi calling.

New fragment: NetworkProviderCallsSmsFragment

New controller: NetworkProviderWifiCallingPreferenceController (ag/12965657)

Old controllers: CallsDefaultSubscriptionController and SmsDefaultSubscriptionController

Screenshot of Provider Model: https://screenshot.googleplex.com/4NiK9AKsH4D8kkt.png

Screenshot of current: https://screenshot.googleplex.com/BtCgYmnpvT97SQs.png

Doc: https://docs.google.com/presentation/d/1azrZVS54pxM2lt9LkZHtFh_6W3fyDw_kTTPVQ_mJCi4/edit#slide=id.g9c7123c172_0_448

Bug: 172053880
Test: manual
Change-Id: I55d218d4dd6b6c268a4ee7e369b3e03dfcabd71d
2020-11-20 08:21:44 +00:00
Zoey Chen
cda7efb94d [Provider Model] Implement Calls & SMS controller
Screenshot of Provider Model:
Single SIM:
https://screenshot.googleplex.com/4pGBU7XK55CwJ7o.png
Dual SIM:
https://screenshot.googleplex.com/bXaFjsfGkgyHoYF.png

Screenshot of current: https://screenshot.googleplex.com/BtCgYmnpvT97SQs.png

Doc: https://docs.google.com/presentation/d/1azrZVS54pxM2lt9LkZHtFh_6W3fyDw_kTTPVQ_mJCi4/edit#slide=id.g9c7123c172_0_448

New controller: NetworkProviderCallsSmsController

Bug: 172053880
Test: manual
Change-Id: I86e9fc71d2b8562d838c5b5c6bd9c443656e2624
2020-11-20 15:43:04 +08:00
Zoey Chen
006fc3486b Merge "[Provider Model] Implement Wi-Fi callings in Calls & SMS" 2020-11-20 06:54:42 +00:00
Zoey Chen
fa2417aaac [Provider Model] Implement Wi-Fi callings in Calls & SMS
NetworkProviderWifiCallingPreferenceController is a catrgory of WFC.

It will add NetworkProviderWifiCallingGroup for SIMs which is WFC enabled dynamically.

Implement the current WFC logic: WifiCallingPreferenceController, for Provider Model

Diff with WifiCallingPreferenceController
https://diff.googleplex.com/#key=nzCL6Ybrkr19

Screenshot of Provider Model:
https://screenshot.googleplex.com/BCXxdo4iNh6M3tH.png

Screenshot of current WifiCallingPreferenceController:
https://screenshot.googleplex.com/BsBE3A5YRs6arw9.png

Doc: https://docs.google.com/presentation/d/1azrZVS54pxM2lt9LkZHtFh_6W3fyDw_kTTPVQ_mJCi4/edit#slide=id.g9c7123c172_0_448

Bug: 172053880
Test: manual & atest -c NetworkProviderWifiCallingPreferenceControllerTest & atest -c NetworkProviderWifiCallingForSubTest
Change-Id: I6f4b4a257bc5e94be3090445ccabbcb261a03730
2020-11-20 12:54:40 +08:00
Sarah Chin
111a371005 Merge "Update setCdmaRoaming/SubscriptionMode APIs" am: b26cf2d260 am: 04b9046ec6 am: caa76d8261
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1506517

Change-Id: I3305ed2659027a109672c10a06b70300c66ba80e
2020-11-20 04:43:00 +00:00
Sarah Chin
caa76d8261 Merge "Update setCdmaRoaming/SubscriptionMode APIs" am: b26cf2d260 am: 04b9046ec6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1506517

Change-Id: I8780119041580b96c823b76ba944599484ac317f
2020-11-20 04:08:18 +00:00
Sarah Chin
ce9fda5a60 Update setCdmaRoaming/SubscriptionMode APIs
Test: atest TelephonyManagerTest
Test: make RunSettingsRoboTests
Bug: 171884158
Bug: 171883908
Change-Id: Ib78149c41612d56a46974621eb71b5e0cfe97c5a
Merged-In: Ib78149c41612d56a46974621eb71b5e0cfe97c5a
2020-11-19 14:46:37 -08:00
Weng Su
f0b9dc570b [Provider Model] Add Internet preference to replace Wi-Fi preference
- Change title from "Wi-Fi" to "Internet"
- Remove Wi-Fi switch
- Screenshot:
  https://screenshot.googleplex.com/9tmXYQXKSsuGwEY
  https://screenshot.googleplex.com/5uMCeruXsX3gP9j

Bug: 172295984
Test: manual test
  atest -c InternetPreferenceControllerTest
  make RunSettingsRoboTests ROBOTEST_FILTER=NetworkDashboardFragmentTest
Change-Id: Ie4a3c9aff45fbe7b28594afc9c603e6df57300bf
2020-11-19 14:51:56 +00:00
Zoey Chen
87a5961243 [Provider Model] Show all carrier's name on MobileNetworkSummaryController's summary
Screenshot of Provider Model: https://screenshot.googleplex.com/6mKLeMWGWZJh86u.png

Screenshot of current: https://screenshot.googleplex.com/Abncb2QGh5TWxEv.png

Doc: https://docs.google.com/presentation/d/1azrZVS54pxM2lt9LkZHtFh_6W3fyDw_kTTPVQ_mJCi4/edit#slide=id.g9c7123c172_0_448

Bug: 172229551
Test: manual and make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkSummaryControllerTest

Change-Id: I0f2a23659ef80b6a76b34af9503ad8d746967859
2020-11-17 08:33:54 +00:00
TreeHugger Robot
d58a9cdd05 Merge "[Provider Model] Preferences Settings UI change" 2020-11-16 06:35:07 +00:00
Weng Su
6bf7b1a72f [Provider Model] Preferences Settings UI change
- Change the title from “Wi-Fi preference” to “Preferences”
- Change the summary from “Wi-Fi turns back on automatically” to
“Connect to public networks”
- Remove “Turn on Wi-Fi automatically” preference
- Screenshot:
  https://screenshot.googleplex.com/Areywyb46deK9VQ
  https://screenshot.googleplex.com/6H5Z4PxA5tWXZ6S

Bug: 172788645
Test: manual test
Change-Id: Ibce21f1d740a139b407a0a9a41f2cb4c4e34776c
2020-11-15 20:14:25 +00:00
Zoey Chen
baa56fac45 Merge "[Provider Model] Add new API to detect" 2020-11-15 16:04:13 +00:00
Zoey Chen
3abe48ef38 [Provider Model] Add new API to detect
1. current connection is mobile data
 - remove the SubscriptionsPreferenceController#activeNetworkIsCellular() and move into MobileNetworkUtils
2. isProviderModel API
 - Add it in Util for Provider Model
3. isWiFiCallingEnabled
 - remove WifiCallingPreferenceController#isWifiCallingEnabled() and move into MobileNetworkUtils
4. Add nes test case for MobileNetworkUtils

Bug: 171873895
Test: atest -c MobileNetworkUtilsTest
Change-Id: I4bfdf0537fe07d064d6c0ba4a2c44b4a4f158d91
2020-11-13 18:01:10 +08:00
Weng Su
6ec5cdf06a Merge "[Provider Model] Non-carrier data usage settings UI change" 2020-11-13 02:50:06 +00:00
Weng Su
d9d9224c0f Merge "[Provider Model] Remove “Use Wi-Fi” switch" 2020-11-12 12:38:35 +00:00
Weng Su
890d3e039b [Provider Model] Non-carrier data usage settings UI change
- Change the title from “Wi-Fi data usage” to “Non-carrier data usage”
- Change the warning message from “Carrier data accounting may differ
from device accounting” to “Excludes data that is used by carrier
networks”
- Screenshot:
  https://screenshot.googleplex.com/3bicWHu7g5StH8R
  https://screenshot.googleplex.com/AqceQBtY4AqnuGH

Bug: 172788855
Test: manual test
Change-Id: Ic4d6e5dbb0b7d1d851f6cf033d400a7f780261ac
2020-11-12 08:04:35 +00:00
Bonian Chen
d2e22f4cee [Settings] Reduce the operation of VoLTE config redraw
There're 3 VoLTE configuration UIs sharing the same configuration,
but only 1 of them will be displayed.

The 3 classes extending Enhanced4gBasePreferenceController are:
1. Enhanced4gAdvancedCallingPreferenceController
2. Enhanced4gCallingPreferenceController
3. Enhanced4gLtePreferenceController
They're different in the value of getMode().

The design within Enhanced4gBasePreferenceController only allows to show one of them.
Which means, the other two don't need to register for PhoneStateListener and should ignore actions in response to it when receiving callback from PhoneStateListener.

Through detecting the VoLTE configuration mode, some operations could be
avoided.
This fix is targeting to avoid these operations from happening.

Bug: 172987488
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Change-Id: I56d4900b5bcb189693c99e870b013da97ed283db
2020-11-11 09:43:50 +00:00
Bonian Chen
296a4bc62e Merge "[Settings] Add voice call status and VoLTE mode detection into VoLTE UI test case" 2020-11-11 07:12:27 +00:00
Weng Su
597158ce90 [Provider Model] Remove “Use Wi-Fi” switch
- Screenshot
  https://screenshot.googleplex.com/3Kv7JUqJkDuvGGr

Bug: 172788136
Test: manual test
Change-Id: Ie5c522d479b2dedde46ec61b73a41b716e2e119d
2020-11-11 07:03:30 +00:00
Sarah Chin
666c7fb539 Merge "Update setCdmaRoaming/SubscriptionMode APIs" 2020-11-10 08:52:55 +00:00
SongFerngWang
d4a25fd13a Use SubscriptionManager.getResourcesForSubId to get Resources
To support multi-SIM card case. The code uses the
SubscriptionManager.getResourcesForSubId to get Resources.

Bug: 171843666
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest

Change-Id: Ib31e23b81bdbd3b5336b45fc73994f40d021718b
2020-11-10 03:25:36 +00:00
Bonian Chen
227329b2f7 [Settings] Add voice call status and VoLTE mode detection into VoLTE UI test case
1. VoLTE UI should gray out during voice call.
2. UI should be invisible when VoLTE mode mismatch.

Bug: 172781455
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Change-Id: I8b6a212dc727f1ab78f4dd280cb41966b7054180
2020-11-09 12:49:35 +08:00
Jiashen Wang
491d214644 Merge "[SIM Dialog Migration] Migrate SIM enable dialog from LPA to Settings" 2020-11-06 00:07:14 +00:00
Jiashen Wang
7840ae7569 [SIM Dialog Migration] Migrate SIM enable dialog from LPA to Settings
Migrates SIM enabling and DSDS dialog from LPA to Settings.
Design: https://docs.google.com/document/d/1wb5_hoBkZVbkXGNWHbx4Jf61swjfxsJzkytiTzJosYo/edit?usp=sharing
Bug: 160819390
Test: Manually tested eSIM profile enabling.

Change-Id: I9ce690a1594adfc90b62840819237acd54418469
2020-11-05 14:58:15 -08:00
Sarah Chin
7f2a6040ef Update setCdmaRoaming/SubscriptionMode APIs
Test: atest TelephonyManagerTest
Test: make RunSettingsRoboTests
Bug: 171884158
Bug: 171883908
Change-Id: Ib78149c41612d56a46974621eb71b5e0cfe97c5a
2020-11-02 14:39:55 -08:00