Commit Graph

388 Commits

Author SHA1 Message Date
Lei Yu
2bdf358cd1 Merge "Hide network select in some situations" into qt-dev 2019-05-23 20:28:38 +00:00
Lei Yu
2bf8806740 Hide network select in some situations
Hide network select when:
1. NETWORK_MODE_LTE_CDMA_EVDO && worldMode
2. 6 NETWORK_MODE && worldMode && !Tdscdma

Also update GSM/CDMA check since it was only include 1 network mode,
not 6 modes.

Fixes: 131126607
Test: RunSettingsRoboTests
Change-Id: I28782778827ced7d9f24d527d52399e2b544109e
2019-05-23 09:56:28 -07:00
Antony Sargent
8c6098e5cf Fix signal strength display in 'Choose network' list
For GSM networks, the "Choose network" page allows you to manually pick
from among different cell networks, and shows signal strength and
network type (LTE, 3g, etc.) for available ones. The signal strength
wedges were transparent and not visible to the user - this CL fixes
that.

Bug: 132895135
Test: visual (Insert SIM with GSM service, then go to Settings ->
Network & internet -> Mobile network -> Advanced -> Automatically select
network)

Change-Id: Ibbbc60b590b09e4b4f5e31b49fe578769dcdbc4d
2019-05-20 17:20:31 -07:00
TreeHugger Robot
1ffae41f4e Merge "Add check KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL" into qt-dev 2019-05-14 00:54:58 +00:00
Lei Yu
85398a503e Add check KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL
If it is true, then hide:
1. Network Select settings
2. Apn settings

Fixes: 131709441
Test: RunSettingsRoboTests
Change-Id: I203cda570564a41c5bb54a3ad9e60c7f35c0d30c
2019-05-13 15:56:17 -07:00
Brad Ebinger
1350309ecc Merge "Resolve the SIM call manager per subId" into qt-dev 2019-05-10 20:17:38 +00:00
TreeHugger Robot
cf964643b5 Merge "Update summary for mobile data toggle for CBRS." into qt-dev 2019-05-09 00:51:31 +00:00
Andrew Sapperstein
477e345f21 Update summary for mobile data toggle for CBRS.
Fixes: 127529917
Test: robotests
Change-Id: Id2d0bdbcf9674106a3dff8db8e9ceb22dbdda314
2019-05-08 15:55:04 -07:00
TreeHugger Robot
2ace95f386 Merge "Update datausage for DataUsagePreferenceController" into qt-dev 2019-05-08 19:20:13 +00:00
TreeHugger Robot
ea6bd51bea Merge "Fix two problems related to data connectivity in the multi-SIM header" into qt-dev 2019-05-08 18:31:39 +00:00
Lei Yu
9bc3273489 Update datausage for DataUsagePreferenceController
Data usage number was wrong because we didn't set correct
subId, this CL fixes this issue.

Bug: 132113657
Test: RunSettingsRoboTests
Change-Id: If7c9cf2f4709d9a8e5f9a154c02de9484800d6d5
2019-05-08 10:25:10 -07:00
Antony Sargent
4bb253358b Fix two problems related to data connectivity in the multi-SIM header
When you have multiple active SIMs, the Network & internet page has a
header showing entries for each one, with summary text indicating which
one is used for data (and whether it is just set as the default, or
actively using data). We were not properly setting this text when either
data wasn't being used, eg when connected to wifi, or mobile data was
disabled for this SIM. This CL fixes both these problems by adding new
helper classes to listen for relevant events.

Test: make RunSettingsRoboTests
Fixes: 124394250
Fixes: 128857712
Change-Id: I34f2679752fa41a50247dd0b12581cbfd77a34f6
2019-05-07 16:10:52 -07:00
Brad Ebinger
5caefbff3f Resolve the SIM call manager per subId
The SIM call manager used to be resolved based
on what the default voice subscription ID was.
This caused settings to be displayed for the
incorrect subscription. A new API has been added
that allows settings to query the SIM call manager
per subId.

Test: manual, unit testing
Bug: 131627085
Change-Id: I7699508429f7df7a138c24c4c7a6e9f1148b84da
2019-05-07 21:45:05 +00:00
Edgar Wang
133ffc9c57 Show admin dialog when preference is disabled by Device Admin
Fixes: 130694312
Test: manual & robotest
Change-Id: I9c6487ac056ec3d784bd6f6901e96869e27e0b3e
2019-05-08 02:04:05 +08:00
Pengquan Meng
02a54a0150 Merge "Add log for manual network select settings" into qt-dev 2019-05-06 18:15:02 +00:00
TreeHugger Robot
805ba40194 Merge "Format app data usage using IEC unit, not SI unit." into qt-dev 2019-05-04 10:25:26 +00:00
Fan Zhang
71d793cc2a Format app data usage using IEC unit, not SI unit.
Fixes: 131924586
Test: visual
Change-Id: Iedbd15fb9c98a5c93089708e40175cbf5572eeda
2019-05-03 16:53:11 -07:00
Pengquan Meng
97650e9880 Add log for manual network select settings
Add log to manual network select settings code to make the debug easier.

Bug: 131912524
Test: build
Change-Id: I6edb1aac67dd827563fe10adcdc53b6dddea9ca3
2019-05-03 14:37:11 -07:00
Amin Shaikh
3f1de20c7e Fix themed settings icons.
- Added android prefix for homeAsUpIndicator attribute
- Override ic_arrow_down_24dp from androidx
- Remove ic_lock drawable overlay
- Update date and time icon
- Dedupe ic_menu_add and ic_add_24dp

Bug: 131346125
Test: mp settings;
Change-Id: I7223249f2adccc5569a37e8b68cae5499e7c7620
2019-05-03 17:02:46 +00:00
Andrew Sapperstein
aaf8af5430 Add metrics categories for delete sims dialogs.
Fixes: 131519375
Test: is metrics
Change-Id: I020e3d887fb0408617428d00386bb57318b6b175
2019-05-02 14:03:24 -07:00
TreeHugger Robot
30d0e6c7d7 Merge "Fix null pointer in SubscriptionUtil" into qt-dev 2019-04-30 23:43:42 +00:00
Salvador Martinez
b5d471c19b Fix null pointer in SubscriptionUtil
Sometimes we get null sub info which causes a crash. This just
makes it so that if we see that we treat it as inactive since
there isn't really a world where an active null sub info makes
sense.

Test: atest SubscriptionUtilTest
Bug: 131603073
Change-Id: Id5ecbecf011e19ff02d9465e0571b1d17c83de9a
2019-04-30 09:59:27 -07:00
TreeHugger Robot
2740c4a052 Merge "Add 'Erase SIM' to mobile network details page" into qt-dev 2019-04-30 16:47:54 +00:00
TreeHugger Robot
8b285f2355 Merge "Show mobile data slice in Search even no SIM card" into qt-dev 2019-04-30 11:05:37 +00:00
Antony Sargent
562f7b2f91 Add 'Erase SIM' to mobile network details page
This adds a preference to the mobile network details page that lets a
user delete an eSIM profile.

Bug: 124254555
Test: make RunSettingsRoboTests
Change-Id: I1e266566afc36ff39bf1b1c6d1db674c7c6e8648
2019-04-29 16:57:35 -07:00
Antony Sargent
972bf437f6 Remove empty MNC filtering when retrieving available subscriptions
During the early phase of work on DSDS, we found that a hacky solution
to seeing duplicate subscriptions that are part of a logical group (eg
Google Fi) was to filter out the entries with empty MNC strings. It
turns out this breaks things for some legitimate eSIM subsctiptions, and
isn't needed anymore because of the fixes that landed for b/127833821.

Fixes: 130706446
Test: make RunSettingsRoboTests
Change-Id: Ic4472c1de3c3e2449139b3e2ffb20d11a0058e8a
2019-04-26 13:45:53 -07:00
Lei Yu
1a66d9b22f Merge "Hide number label if info is opportunistic" into qt-dev 2019-04-26 16:54:02 +00:00
Sunny Shao
238928dea2 Show mobile data slice in Search even no SIM card
- return slice like in airplan mode when mobile data disabled in the getSlice
  of the MobileDataSlice
- replace CONDITIONALLY_UNAVAILABLE by DISABLED_DEPENDENT_SETTING in the
  getAvailabilityStatus of the MobileDataPreferenceController
- remove the duplicated mobile data item by update data_usage_cellular.xml

Fixes: 130650621
Test: robotest
Change-Id: I42c0983c27d4edb17fcdce7ca386023911254d2d
2019-04-26 14:44:55 +08:00
Lei Yu
7e9ef34112 Hide number label if info is opportunistic
Fixes: 125855323
Test: RunSettingsRoboTests
Change-Id: I6f77d65691319097c9bf56232710ba12fa7360f3
2019-04-25 14:56:59 -07:00
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
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
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