Commit Graph

1771 Commits

Author SHA1 Message Date
TreeHugger Robot
c78e4d1e0f Merge "Remove disable mobile data confirm dialog for single sim." into qt-dev 2019-04-24 22:50:24 +00:00
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
Antony Sargent
74d8d9c31f Implement off state for SIM details page
When a subscription is disabled, we need to hide most things on the
details page. The UX mocks called for leaving in a few things such as
the data usage header and some carrier information, but in tests I've
done it looks like the telephony APIs don't have any of that available
when the subscription is disabled. So for now the only thing left on the
page in the disabled case is the on/off toggle at the very top.

Fixes: 129665956
Test: make RunSettingsRoboTests
Change-Id: I98f4590fca38d03b1e5ff2cf0d2b4876d2adf936
2019-04-24 10:54:47 -07:00
Antony Sargent
4d9ff1e113 Merge "Always show disabled pSIMs in single-sim mode" into qt-dev
am: cd07aa1cc4

Change-Id: I830e9604d1005f354d10ff5cb30c911243284e42
2019-04-23 14:28:57 -07:00
TreeHugger Robot
cd07aa1cc4 Merge "Always show disabled pSIMs in single-sim mode" into qt-dev 2019-04-23 21:06:47 +00:00
Antony Sargent
bdd9eb3ba7 Always show disabled pSIMs in single-sim mode
In single-sim mode, you can have both an eSIM subscription and a pSIM
inserted into the device, and only one of them can be enabled. It turns
out that if the pSIM is the disabled one, we would not show it in the
settings UI; this CL fixes that.

It also fixes a somewhat related problem that I noticed while testing
this, that if you have only one subscription that happens to be
disabled, we were not showing the on/off switch at the top of the page,
which would leave you with no way to enable it.

Bug: 129864878
Test: make RunSettingsRoboTests
Change-Id: I4214ad34c59ac2df429772c066c51a9318f5baa7
2019-04-23 10:55:51 -07:00
Lei Yu
7ec9c1db1d Merge "Add mms preference and controller" into qt-dev
am: f3365e911d

Change-Id: I7d564e576a0ce387f376e71af54839794a3281cd
2019-04-22 11:14:34 -07:00
Lei Yu
f3365e911d Merge "Add mms preference and controller" into qt-dev 2019-04-22 17:55:34 +00:00
Mark Chien
f886be6999 Merge "Ignore the outdated entitlement check" am: d7885ca73a
am: 7b30503dc4

Change-Id: I294f9f2e9ca239cb8f1c689580ce266ddead8f5b
2019-04-19 21:07:49 -07:00
Mark Chien
d7885ca73a Merge "Ignore the outdated entitlement check" 2019-04-20 02:05:33 +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
bdbca3399b Merge "Turn off debug logging flags" into qt-dev
am: ed9be192b6

Change-Id: Ib0b539172fdeff2eabb86033b10af1b811171e7f
2019-04-17 10:45:33 -07: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
8f9c60652f Merge "Hide Mobile preference for secondary user" into qt-dev
am: ad06c36882

Change-Id: Ied33b1b8cef008dbca300d3809296ea81c123ce2
2019-04-16 14:48:35 -07:00
Lei Yu
ad06c36882 Merge "Hide Mobile preference for secondary user" into qt-dev 2019-04-16 20:47:17 +00:00
Lei Yu
c53b29300a Merge "Disable Mobile settings in one condition." into qt-dev
am: 421ca22a58

Change-Id: I9798659adcbe48277abca54d424fa0916b245821
2019-04-16 12:24:50 -07:00
TreeHugger Robot
421ca22a58 Merge "Disable Mobile settings in one condition." into qt-dev 2019-04-16 18:20:11 +00:00
Colin Cross
2e7a226e65 Merge "Update Settings for guava 27.1" into qt-dev-plus-aosp 2019-04-16 03:35:51 +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
markchien
f9f0d11782 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
2019-04-15 15:54:52 +08:00
Colin Cross
e2abf3f5c6 Update Settings for guava 27.1
Futures.addCallback now requires an Executor argument.

Bug: 130306229
Test: m checkbuild
Change-Id: I1958918e26eff6c0966c7a6bcf3dec6029003162
2019-04-11 18:21:41 -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
Amit Mahajan
ac0244e572 Treat mcx apn type as not wild-cardable.
Test: manual
Bug: 130167974
Merged-in: Ic3e643646491e5a187505fd54ca767ad91e285f5
Change-Id: Ic3e643646491e5a187505fd54ca767ad91e285f5
(cherry picked from commit 2fa0b7ed85)
2019-04-09 14:52:48 -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