Commit Graph

1719 Commits

Author SHA1 Message Date
Jeremy Goldman
7d5483f6d7 Merge "Enhanced4gLteSliceHelper specifies immutable intent" 2020-12-21 07:25:30 +00:00
Jeremy Goldman
50dd14d111 Enhanced4gLteSliceHelper specifies immutable intent
Bug: 172812686
Fixes: 172207848
Test: atest -c Enhanced4gLteSliceHelperTest
Change-Id: I1bfac82e3ce5c66639465befb0517839fb55415e
2020-12-21 05:41:01 +00:00
Bonian Chen
bb5688ea22 Merge changes from topic "eSIM with same group UUID" into rvc-qpr-dev am: 0968b8603e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13241064

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I104ea3e6ace5e0d3fbe80d62e835d2fa986b852b
2020-12-17 15:52:05 +00:00
Bonian Chen
4ea9c2d6a5 [Settings] Only display 1 SIM UI when multiple with same group UUID am: 150eb72a81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13209427

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide453d4b8f1a2b40057804fa1bb47705c05dbf86
2020-12-17 15:52:03 +00:00
Bonian Chen
c2232020c4 [Settings] code refactor - rename isSubscriptionCanBeDisplayed
canSubscriptionBeDisplayed is more readable.

Reasonale:
When cherry-picking ag/12886476 into Android R branch (ag/13209427), a comment from code reviewer suggested this change.
Since ag/12886476 has been merged for a while, another patch for it is perferred option when comparing with reverting that CL and resubmit it.

Bug: 175830728
Change-Id: Ie91eb82504fd7cff6671803a2bc2560139690952
Test: build pass
Merged-In: Ie91eb82504fd7cff6671803a2bc2560139690952
2020-12-17 03:04:50 +00:00
Bonian Chen
79b8ce0212 [Settings] code refactor - rename isSubscriptionCanBeDisplayed
canSubscriptionBeDisplayed is more readable.

Reasonale:
When cherry-picking ag/12886476 into Android R branch (ag/13209427), a comment from code reviewer suggested this change.
Since ag/12886476 has been merged for a while, another patch for it is perferred option when comparing with reverting that CL and resubmit it.

Bug: 175830728
Change-Id: Ie91eb82504fd7cff6671803a2bc2560139690952
Test: build pass
2020-12-17 03:04:24 +00:00
Bonian Chen
150eb72a81 [Settings] Only display 1 SIM UI when multiple with same group UUID
Some carrier(s) expand their service through providing eSIM in companion
with pSIM. Group UUID is designed to group them together as a single
SIM.

Bug: 169455114
Bug: 175069803
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SubscriptionsPreferenceControllerTest
Change-Id: I0934a45a2917ab106627c733162efbee9a13f216
(cherry picked from commit a6b249d625)
Merged-In: I0934a45a2917ab106627c733162efbee9a13f216
2020-12-17 02:12:44 +00:00
Peter Wang
5eb94b4a00 Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" 2020-12-16 20:03:25 +00:00
Peter Wang
ecd856eeeb Added an option in reset menu in Settings to enable resetting Euicc data
only

Bug: 159650638
Fix: 159650638
Test: Local
Change-Id: Ia260b47a4dd0ddf0363740891b5e1d818c8631b7
2020-12-15 18:27:34 -08:00
Jiashen Wang
881d253247 Merge "Fix minor issue for DeleteEuiccSubscriptionDialogActivity" 2020-12-15 01:32:15 +00:00
allenwtsu
91f11e9a47 Change carrier config
Use KEY_ENABLE_PRESENCE_CAPABILITY_EXCHANGE_BOOL instead of
KEY_USE_RCS_PRESENCE_BOOL

Bug: 173828080
Test: build pass
Change-Id: I384686bd073a00341f4e552b71b24798619502fa
2020-12-15 00:28:20 +08:00
Jeremy Goldman
e092a54381 Merge "Update string for discarding changes to a particular APN's settings." 2020-12-14 04:42:09 +00:00
Jeremy Goldman
11f91e47ea Merge "Enhanced4gBasePreferenceControllerTest migrated to junit" 2020-12-14 02:58:24 +00:00
Jeremy Goldman
7a16e45290 Update string for discarding changes to a particular APN's settings.
Previously was unclear whether the changes, or the entire APN was
being discarded. The word "Cancel" more closely implies that the most
recent changes to the screen will be discarded rather than the entire
APN.

This only changes the resource for english. However, many other
languages have a menu_cancel string that seems much closer
to "Cancel" than "Discard" as well.

i.e. http://cs/android/packages/apps/Settings/res/values-zu/strings.xml?l=1029&rcl=a7397bec91183a7a32561fd8d67b0478af6c65bb
http://cs/android/packages/apps/Settings/res/values-es/strings.xml?l=1029&rcl=a7397bec91183a7a32561fd8d67b0478af6c65bb

Bug: 171538880
Test: N/A
Change-Id: I80fde04dbc36078d5c53e68231fcc4e5c3cf94e6
2020-12-14 02:57:39 +00:00
TreeHugger Robot
6571548a37 Merge "[Provider Model] Fix the NetworkDashboardFragmentTest failed issue" 2020-12-13 15:18:40 +00:00
Jeremy Goldman
4348c2c826 Enhanced4gBasePreferenceControllerTest migrated to junit
Bug: 175389659
Test: atest -c Enhanced4gBasePreferenceControllerTest
Change-Id: I7ebcb303eb74168b81dd650fe78f3988647aa64d
2020-12-12 01:11:13 +08:00
Zoey Chen
44559badaf [Provider Model] Should show "No SIM" if there is no SIM in the device.
Bug: 172053880
Test: atest NetworkProviderCallsSmsControllerTest#getSummary_noSim_returnNoSim
Change-Id: I31fd8b4b6928ef8aa7c45ac7651fa26e0b08446e
2020-12-11 20:29:13 +08:00
Weng Su
66869d2ff5 [Provider Model] Fix the NetworkDashboardFragmentTest failed issue
Since the getPreferenceScreenResId() is modified to return different resource ID when provider model enabled. So we need to update SEARCH_INDEX_DATA_PROVIDER class to match the same behavior.

Bug: 175290124
Test:
- Set Settings/System/Developer options/Feature
flags/settings_provider_model to true.
- atest -c NetworkDashboardFragmentTest

Change-Id: I05b0f830158429ddbbfba414cdb33a6df6a7465e
2020-12-10 13:29:49 +00:00
Jiashen Wang
a0a5165c72 Fix minor issue for DeleteEuiccSubscriptionDialogActivity
Bug: 170508680
Test: Manually tested
Change-Id: I656b16f6ca568cd9f5dcbf9a0b031f1ee6f71b49
2020-12-09 23:27:04 -08:00
Remi NGUYEN VAN
f40f71ccf1 Replace isWeaklyValidatedHostname with guava
The guava implementation is more accurate than the basic NetworkUtils
implementation.
NetworkUtils is being moved to its own JAR and will not be available
from Settings.

Bug: 174436414
Test: m
      Wrote test for isWeaklyValidatedHostname, verified it passes with
      guava
Change-Id: I1d01f2beba36009e17f651652e2d7f57be5aa398
2020-12-08 14:02:17 +09:00
Jiashen Wang
8b113cb74a Merge "[SIM Dialog Migration] Sending push notification after DSDS reboot" 2020-12-07 18:31:06 +00:00
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