Commit Graph

1771 Commits

Author SHA1 Message Date
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
TreeHugger Robot
2feea46860 Merge "Fix unit test problems in MobileNetworkSummaryController" 2019-03-08 23:20:29 +00:00
TreeHugger Robot
0962a4615f Merge "Add extra to the intent for adding additional subscription" 2019-03-08 22:43:25 +00:00
TreeHugger Robot
3bcfd763ef Merge "Disable Moblie Data Slice in AP mode" 2019-03-08 19:24:43 +00:00
Antony Sargent
8b26dd27e8 Fix unit test problems in MobileNetworkSummaryController
There were two failing tests due to problems in this class:
-PreferenceControllerContractTest
-SettingsSearchIndexablesProviderTest

In one case it was because we weren't checking for a valid Lifecycle,
and in the other it wasn't implementing PreferenceControllerMixin (or
inheriting from BasePreferenceController).

Bug: 127524919
Test: atest SettingsUnitTests
Change-Id: I662e300d68a21c28e1efb3ec9e23c4a882497176
2019-03-08 11:23:21 -08:00
Antony Sargent
68d56353fb Add extra to the intent for adding additional subscription
In the places where we have a link to let the user add an additional
mobile network subscription, we need the "fore provision" extra added to
the intent.

Bug: 127532036
Test: manual (enable DSDS mode and the settings_network_internet_v2
feature flag, then go to Settings->Network & internet and try clicking
on the '+' button on the right of the Mobile network preference, or
click through that pref if you have 2+ sims and hit the 'Add more'
link. This should bring you into an 'add sim' flow provided by the eSIM
manager)

Change-Id: I56ab2125938f2df07f756d100a7ac993b1e5ced3
2019-03-08 08:51:55 -08:00
Matthew Fritze
6b065caf7e 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:
Fixes: 126726036
Test: robotests
Change-Id: I1c6d95dbb9d0c51247709b9867506c800f5872cd
2019-03-05 14:46:32 -08:00
TreeHugger Robot
3355bc06d0 Merge "Prevent extra reloads in mobile networking page/controllers" 2019-03-05 19:18:27 +00:00
Antony Sargent
ce9a126add Prevent extra reloads in mobile networking page/controllers
On the mobile network details page, as well as in several preference
controllers used in various page, we had listeners for the
ACTION_RADIO_TECHNOLOGY_CHANGED broadcast that when fired would cause a
reload. It turns out that this gets broadcast as a sticky intent, so our
callbaks would fire just after registering to listen, resulting in lots
of unnecessary extra reloading. This was particularly noticable on the
mobile network details page because the entire page gets reloaded.

The fix is to make our listeners ignore the broadcast if it's the
initial sticky one.

Bug: 126419558
Test: make RunSettingsRoboTests
Change-Id: I6ab7b43d74b07a839e45ce5368e45809be658b9d
2019-03-04 16:37:33 -08:00
jackqdyulei
6b242d94dc Add null check for forbiddenPlmns
Fixes: 127202257
Test: RunSettingsRoboTests
Change-Id: I2baa88249fda869640cb2b6debbf6437f0782c27
2019-03-04 13:16:28 -08:00
Doris Ling
55a189a640 Disable App data usage preference if there's no usage data.
- when there is no usage data at all, launching the app data usage page
will show something blank, as there's no cycle with available usage
data. Check the overall historic usage to make sure that there's
usage data to be shown, otherwise, disable the preference.

Fixes: 123518021
Test: make RunSettingsRoboTests
Change-Id: I2d19f85e8618c41e2c31b9e4259cdc522f69e371
2019-02-22 11:18:29 -08:00
Xiangyu/Malcolm Chen
e67344a5c5 Merge "Correct behavior of "Mobile data" button on opportunistic subscriptions." 2019-02-19 21:04:01 +00:00
Malcolm Chen
5506e0c732 Correct behavior of "Mobile data" button on opportunistic subscriptions.
A check was added earlier to make sure in DSDS mode only one sub
shows data on, which is not true for opportunistic subscriptions. For
them, it should always be on (enforced by Telephony) and be disabled
as it shouldn't be turned off.

Bug: 124331860
Bug: 124683219
Test: manual, robolectric
Change-Id: I53c8d881ff71ad25c418085d3eee63e55c786b8f
2019-02-19 21:03:42 +00:00
TreeHugger Robot
2f6de9967b Merge "Add null check for CarrierConfig" 2019-02-15 03:41:25 +00:00
jackqdyulei
26a5023d7f Add null check for CarrierConfig
CarrierConfig maybe null when config loader is not ready, so we need
to add null check here.

Bug: 124447166
Test: RunSettingsRoboTests
Change-Id: I3c104f1ca44bb0bcacad460c68084163c758746a
2019-02-14 12:39:36 -08:00
Fan Zhang
7db118e367 Mass clean up: don't cast class when not needed.
Bug: none
Test: rebuild
Change-Id: Ie3f58a3d5ae99ade28a33dcac80c18de90d4d5b2
2019-02-14 12:26:09 -08:00
Malcolm Chen
0a36e91a49 Don't show hidden subscriptions.
Replace getAvailableSubscriptionInfoList with getSelectableSubscriptionInfoList
so that hidden subscriptions won't show up.

Bug: 121396526
Test: manual
Change-Id: I73c41a6605b68011ba5b619f9d6e8d41d18a9dcd
2019-02-14 02:54:31 +00:00
Lei Yu
bd06923f2f Merge "Update search for mobile network" 2019-02-13 22:43:22 +00:00
TreeHugger Robot
cd15971f14 Merge "Move horizontal progress bar into SettingsLib." 2019-02-13 13:53:56 +00:00
TreeHugger Robot
3eaa0ac051 Merge "Fix some problems with the "Mobile network" preference" 2019-02-13 05:44:06 +00:00
jackqdyulei
5d3ead749a Update search for mobile network
Continue work from ag/5991582:
1. Add search support for CDMA/GSM related preference
2. Update func getAvailabilityStatus, inside it should get all
related manager from subId, rather than default one in controller.

Bug: 117843601
Bug: 77276236
Test: RunSettingsRoboTests

Change-Id: Id72505a512269bdc5adb02e806d38ac367ce9f07
2019-02-12 17:43:54 -08:00
markchien
c992d0f4a9 Support entitlement check in DSDS
Get resource from preferred SIM's subId.

Bug: 122108346
Bug: 120069528
Test: atest TetherServiceTest
Change-Id: Ia4279a418dfa6cd14942b7f4d2a313156066381b
Merged-in: Ia4279a418dfa6cd14942b7f4d2a313156066381b
2019-02-12 16:17:36 +08:00
Mark Chien
a432a61943 Merge "Support entitlement check in DSDS" 2019-02-12 08:05:11 +00:00
TreeHugger Robot
5999ba5448 Merge "Add carrier settings version to network details page" 2019-02-12 05:01:37 +00:00
TreeHugger Robot
00ca556f26 Merge "Create special case mobile data slice" 2019-02-11 22:53:50 +00:00
Antony Sargent
f0d4a3730b Add carrier settings version to network details page
This adds a preference showing the carrier settings version to the
mobile network details page.

Bug: 123995414
Test: make RunSettingsRoboTests
Change-Id: I7b80ead0eadb7375b4404262337e47f75102125c
2019-02-11 14:24:56 -08:00
Lei Yu
7946eee850 Merge "Update search for mobile network settings" 2019-02-11 18:00:57 +00:00
Antony Sargent
475dde51b6 Fix some problems with the "Mobile network" preference
This fixes a few issues with the "Mobile network" preference that shows
on the Network & internet page:

-The pref should not be available at all if the device is wifi-only.

-The pref should be disabled in airplane mode.

-If eSIM support is disabled, we need to disable entry points for adding
 a new eSIM subscription (the summary and click handler in single-SIM
 mode with no physical SIM, and the 'add' button in dual-SIM mode).

Bug: 116349402
Test: make RunSettingsRoboTests
Change-Id: Ic6fe426e9f890d80b399d48a2c9984d4d8b02a10
2019-02-11 09:50:38 -08:00
jackqdyulei
e6d7d3b1e7 Update search for mobile network settings
This CL make all mobile related preferences support:
1. If subId is manually set, check visibility by subId
2. If not, try find whether there is one active subId meets requirement.
If so, isAvailable() will return true to enable search.

Bug: 77276236
Test: RunSettingsRoboTests
Change-Id: I24e2d2f5e882284ba8e997b844caee7722b6b07d
2019-02-08 16:23:11 -08:00
Matthew Fritze
1138218abe Create special case mobile data slice
Build the special case mobile data slice for general use,
and for the Internet Connectivity Panel. The Slice controls
the default data subscription, and links to the subscriptions
page.

Bug: 117804089
Fixse: 119411534
Test: robotests & test app.

Change-Id: I31b524a8fe3182a244d940848090e97250632f39
2019-02-08 13:13:28 -08:00
Antony Sargent
8fc473629a Set summary for SIM entries in multi-SIM header
On the Network & internet page, when you have multiple active SIMs we
add a header with an entry for each one. This CL sets the summary for
those entries to be a 1 or 2 line indication of what services (calls,
SMS, and data) that SIM is used for by default, or just an indication
that the SIM is available. And for the SIM used by default for data, we
include status information about whether it's connected or not.

Bug: 116349402
Test: make RunSettingsRoboTests
Change-Id: I46f37433f753724bbde8876f0d89c3155b2c3812
2019-02-08 20:18:30 +00:00
TreeHugger Robot
16d8f7087a Merge "Fix mobile data on/off switch for multi-sim case" 2019-02-07 16:51:02 +00:00
Joel Galenson
ad0e49bd6e Move horizontal progress bar into SettingsLib.
Remove the horizontal progress bar as it is being moved into
SettingsLib.

Bug: 123538370
Test: See progress bar in wifi settings screen.
Change-Id: I8fc94b1f3a7a52559cfcf89f3e4a604784ec9995
2019-02-07 08:21:01 -08:00
Antony Sargent
8af118bd87 Fix mobile data on/off switch for multi-sim case
In multi-sim, the on/off switch for mobile data on the mobile network
details page doesn't quite work right. The thing it's missing is
checking whether the current sim is the default one used for data - if
it's not the default, then the switch should be off even if mobile data
is turned on. And clicking to enable needs to prompt the user to ask if
this sim should be become the new default one, which we already have
code for, but we weren't triggering it properly.

Bug: 124005813
Test: make RunSettingsRoboTests
Change-Id: Ifdf58addfde94b3bac85c68e4b22ddfbaf01dff7
2019-02-06 14:28:27 -08:00
TreeHugger Robot
2f13aa55d6 Merge "Add an on/off switch to the top of mobile network details page" 2019-02-06 18:00:25 +00:00
Antony Sargent
f6d3ac2893 Add an on/off switch to the top of mobile network details page
When a device is in DSDS mode and has two mobile network subscriptions,
a user may want to completely disable one of those subscriptions. This
implements the UI for this, calling into some recently added APIs in the
SubscriptionManager class.

Bug: 122670283
Test: make RunSettingsRoboTests
Change-Id: I40fd3e777ce3542004e4761406b24196505b97d8
2019-02-05 12:28:57 -08:00