Commit Graph

355 Commits

Author SHA1 Message Date
Fan Zhang
56c6f89a22 Remove disable mobile data confirm dialog for single sim.
Fixes: 124005813
Test: robotest
Change-Id: I2da563f26d6dbb1ec3c6c205f21a96c896b51334
2019-04-24 13:50:09 -07:00
Lei Yu
f3365e911d Merge "Add mms preference and controller" into qt-dev 2019-04-22 17:55:34 +00:00
Lei Yu
5d85dfb123 Add mms preference and controller
Only visible when it is metered and mobile data off.
Also refactor one mobile data observer so we can reuse it.

Bug: 130222866
Test: RunSettingsRoboTests
Change-Id: Id218f51da3c373fad98c1a39cfadd6b0e8c46a88
2019-04-19 11:25:14 -07:00
markchien
8667e01cf5 Ignore the outdated entitlement check
Don't run entitlement if the request is base on outdated subId.

Bug: 129751453
Test: -build, flash, boot
      -atest TetherServiceTest
      -manual test with carrier SIM

Change-Id: Id3157df1a5758f8c72acbc45c9fefd2215c87395
Merged-In: Id3157df1a5758f8c72acbc45c9fefd2215c87395
2019-04-18 13:53:40 +00:00
Yanting Yang
118e7aee28 Turn off debug logging flags
Fixes: 130558346
Test: visual
Change-Id: Ie82bfe503f789435a3474697391fdfdeb94864ee
2019-04-17 19:55:54 +08:00
Lei Yu
ad06c36882 Merge "Hide Mobile preference for secondary user" into qt-dev 2019-04-16 20:47:17 +00:00
TreeHugger Robot
421ca22a58 Merge "Disable Mobile settings in one condition." into qt-dev 2019-04-16 18:20:11 +00:00
Lei Yu
3000943432 Hide Mobile preference for secondary user
Fixes: 128917967
Test: RunSettingsRoboTests
Change-Id: Ibb95e3f0f42a8c484807a286bc77e8764eb31fcf
2019-04-15 15:17:58 -07:00
Lei Yu
8164361792 Disable Mobile settings in one condition.
If there is no active subscription and esim is unsupported, disable
this preference.

Bug: 129143739
Test: RunSettingsRoboTests
Change-Id: I5f8b0d95df8764a3a505aae5e26df42e9412c021
2019-04-15 12:28:53 -07:00
Lei Yu
e9226c4bba Disable icon for NetworkOperatorPreference
When using old api, disable icon because data in CellInfo is wrong.

Fixes: 128393160
Test: RunSettingsRoboTests
Change-Id: Ide5b424e86d2f0a19cf1e0e6bf22edb270822690
2019-04-11 16:18:50 -07:00
TreeHugger Robot
b346760045 Merge "Fixed display name not saved after carrier changed" into qt-dev 2019-04-11 00:02:41 +00:00
TreeHugger Robot
3b7cdfb708 Merge "Go to the correct subscription in WifiCallingSettings" into qt-dev 2019-04-10 20:01:32 +00:00
TreeHugger Robot
d79e9c498a Merge "Fix up Network and Internet Slice" into qt-dev 2019-04-10 19:44:42 +00:00
Andrew Sapperstein
8bd90f58bf Merge "Updates to data usage prefs" into qt-dev 2019-04-10 16:49:49 +00:00
Jack Yu
5e571128c1 Fixed display name not saved after carrier changed
The caller needs to specify the name changing source, otherwise
telephony resets it to default after SIM swapped.

Bug: 130237749
Test: Manual
Change-Id: Iaa46db7bf22a35cb583faae069c9f2519ba4f94f
2019-04-10 08:01:15 -07:00
Antony Sargent
77df63d371 Updates to data usage prefs
-Remove 'Data Usage' pref from Network & internet homepage
-Add 'Data warning & limit' to mobile network details page

Fixes: 127535879
Fixes: 130241963
Test: robotests

Change-Id: I28b3de34dcf11140762b4e3ee5b465f842ac48d4
2019-04-10 01:53:24 +00:00
Antony Sargent
02db2ef9b6 Go to the correct subscription in WifiCallingSettings
For subscriptions that support wifi calling, we have a preference on the
mobile network details page which leads to a Wifi Calling page. That
page already supports the concept of multiple subscriptions with a
header strip containing a tab for each subscription that supports wifi
calling. However, we were not necessarily selecting the *correct* tab
when going to this page. So you might be viewing the mobile network
details for subscription B and click on "Wifi Calling", only to land on
the page with the tab for subscription A selected.

This CL fixes the problem by adding an extra with the current
subscription id to the Preference's intent in
WifiCallingPreferenceController, and then reads that extra in
WifiCallingSettings and uses it to select the appropriate tab.

Fixes: 117135894
Test: make RunSettingsRoboTests
Change-Id: I3aec30072712247d14fe0fb6b61207535f9e981c
2019-04-09 16:08:04 -07:00
Matthew Fritze
441a439431 Fix up Network and Internet Slice
- Fix pref key for Airplane mode
- Return null when no mobile data is available

Test: robotests
Fixes: 130244854
Change-Id: I88806cb9215af159114ac150c20cdb8fb413befe
2019-04-09 15:39:39 -07:00
TreeHugger Robot
5840e1e1cd Merge "Use helper method for determining whether eSIM is supported" into qt-dev 2019-04-09 20:45:10 +00:00
TreeHugger Robot
125fe8ae9f Merge "Treat mcx apn type as not wild-cardable." into qt-dev 2019-04-09 20:18:03 +00:00
Antony Sargent
f5bc241627 Use helper method for determining whether eSIM is supported
It turns out to be more complicated than I had thought to determine if a
device should be considered to support eSIM. But the good news is that
we already had a helper method for this - this CL switches to using it
in some code for DSDS UI.

Fixes: 129061243
Test: make RunSettingsRoboTests
Change-Id: I41e500eb70b6c6b725c0ddf09fe1ca1a69df4563
2019-04-09 11:31:08 -07:00
Antony Sargent
4646fe8e63 Use active instead of available subscriptions in 2 places
In a couple of places we were showing DSDS UI using the list of
*available* subscriptions instead of the list of *active* ones. This
difference is relevant for instance if you have multiple eSIM profiles -
in typical hardware only one of those can be active at one time. This CL
fixes that problem in two places:

1) The header at the top of the Network & internet page

2) The ListPreference's on the mobile network detail page for selecting
   the default subscription for Calls / SMS.

Fixes: 129673046
Test: make RunSettingsRoboTests
Change-Id: I891c856bdd4516286fcee1067684d9161ceaca80
2019-04-08 16:22:55 -07:00
Xiangyu/Malcolm Chen
81f31ef4d3 Merge "Revert switchBar if enable / disable subscription fails." into qt-dev 2019-04-08 21:38:25 +00:00
Amit Mahajan
2fa0b7ed85 Treat mcx apn type as not wild-cardable.
Test: manual
Bug: 130167974
Change-Id: Ic3e643646491e5a187505fd54ca767ad91e285f5
2019-04-08 14:22:40 -07:00
TreeHugger Robot
b93761d252 Merge "Delete carrier entry from mobile network details page." into qt-dev 2019-04-08 20:00:29 +00:00
Malcolm Chen
046419a92a Revert switchBar if enable / disable subscription fails.
Bug: 123321718
Test: build manual test
Change-Id: Ia7e8c762d91f81b67e0d0b11d36dfa78ec1e2d18
2019-04-08 18:42:06 +00:00
TreeHugger Robot
5c28e42538 Merge "Fix 'Advanced' collapse point on Network & internet page" into qt-dev 2019-04-08 18:15:57 +00:00
Andrew Sapperstein
95c915d9dc Delete carrier entry from mobile network details page.
Followup CL will need to delete the backing code after we remove the feature flag.

Bug: 127540176
Test: robotests and visual inspection
Change-Id: I17e917b9726cf7f5470af09332ede38f8c253eed
2019-04-08 11:15:47 -07:00
TreeHugger Robot
6010c3a9a8 Merge "Don't allow CBRS subscriptions to be set as default for Calls/SMS" into qt-dev 2019-04-06 04:05:32 +00:00
Antony Sargent
ed5c2a1b10 Don't allow CBRS subscriptions to be set as default for Calls/SMS
CBRS subscriptions (also known as "opportunistic" in the code base) are
data-only and it should not be possible to try to set them as the
default for Calls or SMS.

Fixes: 125855327
Test: make RunSettingsRoboTests
Change-Id: Ie20ef21ccc7b27315089f6a61cceb6e1512ec373
2019-04-05 16:48:53 -07:00
Antony Sargent
24aa3b3504 Fix 'Advanced' collapse point on Network & internet page
On the Network & internet page, we want to collapse all the prefs into
'Advanced' that appear after 'Data Saver'. The mechanism for specifying
where the collapse point starts is just a static count, and it doesn't
really understand the concept of dynamically added preferences like the
ones we add at the top when the device is in DSDS mode. To fix this in
the short term, this CL makes the header that manages these prefs
manually adjust the count as needed. In the future we'd like to have a
better mechanism for this added in the support library.

Fixes: 128855968
Test: make RunSettingsRoboTests
Change-Id: I4509726ff29bc71e1f0b3d4a2f60dffe4b1dd7ac
2019-04-04 10:21:24 -07:00
jackqdyulei
c833ee74ca Customized Wifi calling text
This only fixed in old page from aosp/777974. We need to migrate
it to new preference controller

Fixes: 117257109
Test: Manual
Change-Id: I257be10d7cc1fc4a91ee0df404dd69b4d2ee8ae2
(cherry picked from commit acacaf44d3)
2019-04-04 17:15:59 +00:00
Lei Yu
e4f64e5c0c Merge "Move telephony method to worker thread" 2019-04-03 22:45:28 +00:00
jackqdyulei
6db1440a0a Move telephony method to worker thread
Get bug complaining it blocks UI even though it works fine some devices.
This CL moves methods to worker thread and keep progressbar
shown at least for 1 second, to avoid janky UI.

Fixes: 129329645
Test: RunSettingsRoboTests
Change-Id: Iee51949b7f6dfe2ede0fc4e6cd0f7b96d7199081
2019-04-03 22:45:07 +00:00
tonyzhu
2dceec7661 Control VoLTE toggle names by "show_4g_for_lte_data_icon_bool".
Using "show_4g_for_lte_data_icon_bool" to control VoLTE toggle names,
making sure strings can be correspond to the icon.

Bug: 128325427
Test: Use commands to override carrier config to observe the
UI as expected.
Test: atest pass.

Change-Id: I41dd28eb2c14d385a8396c551bf5ef2cf9258997
2019-04-02 09:48:44 +08:00
TreeHugger Robot
10001060e7 Merge "Check wfc roaming config when read" 2019-03-27 22:55:43 +00:00
Youming Ye
f9c68dc980 Check wfc roaming config when read
Bug: 127913488
Test: Build
Change-Id: I0a3e8d3f4bc0590f12085f5963892a1d8278efdc
2019-03-27 10:23:15 -07:00
Tony Zhu
14ce904fa3 Merge "Fix VoLTE toggle names for all carriers." 2019-03-26 11:41:58 +00:00
tonyzhu
ef9c44461f Fix VoLTE toggle names for all carriers.
Change default from "Enhanced 4G LTE Mode" to "VoLTE".
Add 4g calling and its sub summary.
Show carreirs VoLTE toggle names by carrier config.

Bug: 129112234
Bug: 129153582
Test: Use commands to override carrier config to observe the
UI as expected.

Change-Id: I1d418873a661b3c20c5a6d0a056dcb2573742c65
2019-03-26 11:43:51 +08:00
Antony Sargent
fcc9440a52 String changes for some SIM switch confirmation dialogs
These are changes for strings used in two scenarios:

-When switching which SIM is used for mobile data. This is an update to
 some existing strings.

-Enabling an eSIM when another one is already enabled (so the first one
 will need to be disabled). These are new strings.

Bug: 129156640
Test: compile, plus manual (run a device in DSDS mode, go to details for
SIM that isn't currently used for mobile data, and tap on mobile data
switch)

Change-Id: Ie9dfe23c466cb454bbad916ba83b833967a0da0e
2019-03-22 16:47:33 -07:00
Jack Yu
c2299333ae Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo" 2019-03-18 17:28:08 +00:00
Jack Yu
8533937220 Renamed NetworkRegistrationState to NetworkRegistrationInfo
API review changes. The class covers more information other than
registration state.

Test: Build
Bug: 127657991
Change-Id: I362bcd3e4bec91817081ddea2f822062b12c4207
2019-03-15 15:03:27 -07:00
TreeHugger Robot
6f822c1049 Merge "Fix for affordances to add a mobile subscription" 2019-03-15 21:47:32 +00:00
Antony Sargent
10353cd8b6 Fix for affordances to add a mobile subscription
This changes the behavior for when we show an affordance to add a mobile
subscription via the eSIM manager (if eSIM is supported).  On the
Network & internet page, the behavior we now want for the "Mobile
network" pref has several possibilities as detailed below.

No existing subscriptions:
- Summary is "Add a network"
- Tapping on pref leads to the add subscription flow

One existing subscription:
- Summary is the name of the subscription (usually the carrier name)
- Tapping left-hand side of the pref leads to mobile network details
- A "+" button is shown on right of pref, and tapping "+" leads to the
  add subscription flow

2 or more existing subscriptions:
- Summary is "<count> SIMs"
- Tapping left-hand side of the pref leads to a new page with the list
  of subscriptions
- A "+" button is shown on right of pref, and tapping "+" leads to the
  add subscription flow

The existing code controlling the "Mobile network" pref (in
MobileNetworkSummaryController.java) already had behavior similar to
this, but needed to be updated to no longer rely on whether we're in
DSDS mode.

Also, the page with the list of subscriptions that you can go to in the
"2 or more existing subscriptions" case mentioned above has an "Add
more" link at the bottom which leads to the same eSIM manager flow, but
it was always showing this link even if the device doesn't support
eSIM. This CL also fixes that problem.

Bug: 127870567
Test: make RunSettingsRoboTests
Change-Id: Ie8cca47ac81f8992fa6ecf1940bdfed411fd333b
2019-03-15 10:27:21 -07:00
Jack Yu
763f7710fe Moved transport to IntDef
Moved out from the sub class per API review feedback.

Test: Build
Bug: 128607082

Change-Id: I4c476b61b472a9ce706ffe9e52da47e26b0b6dcf
2019-03-14 20:18:42 -07:00
Matthew Fritze
cc50a4a540 Disable Moblie Data Slice in AP mode
When airplane mode is enabled, users should not be able to
change the value of mobile data. Thus, when airplane mode is enabled,
replace the Slice with a no-op slice explaining why it cannot be
changed.

Fixes: 119411534
Fixes: 126726036
Test: robotests
Change-Id: I991fe05ad8f18004f77fbf1c87403de602d3a267
2019-03-13 09:07:19 -07:00
Fan Zhang
1ef08ae814 Fix robotests
This is related to settings_network_and_internet_v2 flag turn on. Some
tests were assuming old flag behavior.

Fixes: 128356137
Test: robotests
Change-Id: I4eca49f24ad5a10a0fb40f2c02a2d139ba4cb1a4
2019-03-12 16:50:28 -07:00
Fan Zhang
717d4137b1 Hide network & internet top level entry for demo users.
Fixes: 113705941
Test: robotest
Change-Id: I72fdc4c7221963ae61e037c709b5158c207bd3e4
2019-03-12 12:44:26 -07:00
TreeHugger Robot
a07961a4bf Merge "Revert "Disable Moblie Data Slice in AP mode"" 2019-03-12 01:37:54 +00:00
Matthew Fritze
350ad14f10 Revert "Disable Moblie Data Slice in AP mode"
This reverts commit 6b065caf7e.

Reason for revert: flaky test: b/128355821

Change-Id: I4fccac1bf7978c5743bde9dd9bb0b76ea4733d2b
2019-03-11 23:58:41 +00:00