Commit Graph

447 Commits

Author SHA1 Message Date
Antony Sargent
4d76ef7b2e Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e am: 5d186f5346
am: f0e3ac6f27

Change-Id: I4dd3e2855de57f1a3e3001fa8cda3206e8e045f4
2019-06-11 13:27:54 -07:00
Antony Sargent
f0e3ac6f27 Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e
am: 5d186f5346

Change-Id: Ib92cedd28e291ba8e606f21883a7d69e73251a5c
2019-06-11 13:19:53 -07:00
Antony Sargent
e548fc6334 Remove on/off toggle for physical SIMs
Our original design for mobile network subscription management included
having an on/off toggle for both eSIMs and physical SIMs. However, it
turns out that our current telephony stack has some problems with
disabling physical SIMs, so for now we're removing the on/off
toggle. Because of this, we've added a footer to the SIM details page
for physical SIMS letting users know that to disable them you need to
remove them from the device.

Even though we're removing the on/off toggle for pSIMs, there are still
a few edge cases where you could end up with a disabled one (eg having
two SIMs in single-SIM mode where the eSIM is active and then you erased
the eSIM). In order to have a way to re-enable the pSIM in these cases,
this CL changes the relevant pref's summary to "Tap to activate <name>"
and makes the tap action begin the re-enabling. This can affect either
the Mobile network pref on the Network & internet main page (if this
disabled pSIM is the only SIM), or an entry in the Mobile networks list
page (if there are still multiple SIMs present).

Finally, this also fixes a problem where we weren't showing the on/off
toggle for eSIMs if you only had one SIM total; we actually always want
to show it for eSIMs.

Bug: 132921553
Test: make RunSettingsRoboTests
Change-Id: Id0750ebd5bed46dc2450b65b53cc81847ef09b82
2019-06-10 14:41:08 -07:00
Andy Chou
d8ff88aa81 Merge "UE showed wrong title and message when enabling data roaming." into qt-dev am: a9e8c50764 am: 8c0d669d6e
am: 3d43db4e50

Change-Id: Icd7d4f913c47a25278d85098a84a9e789191d3b2
2019-06-05 20:46:46 -07:00
Andy Chou
8c0d669d6e Merge "UE showed wrong title and message when enabling data roaming." into qt-dev
am: a9e8c50764

Change-Id: I8d6b2b025fd039202eca5f6c8eefea1acb8f0e91
2019-06-05 19:49:12 -07:00
Andy Chou
a9e8c50764 Merge "UE showed wrong title and message when enabling data roaming." into qt-dev 2019-06-06 00:35:16 +00:00
Antony Sargent
5217f29671 Add a "data during calls" preference am: aeb1da0db9 am: 7f7f7cda18
am: 7a48cb470b

Change-Id: I8f9e97915fa3063d0a2f865ed749201fb404f5bc
2019-06-03 19:00:57 -07:00
Antony Sargent
7f7f7cda18 Add a "data during calls" preference
am: aeb1da0db9

Change-Id: Ib33d13995f1c1c51bc0b17f109854a5e484f5741
2019-06-03 18:39:19 -07:00
Antony Sargent
aeb1da0db9 Add a "data during calls" preference
This adds a switch which appears on the SIM details page for any SIMs
that aren't the default on for data. It lets the user opt-in to turning
on data on this SIM only in the case where there is an active call -
this is needed because in some cases the default data SIM may not be
able to be used when a call is active on another SIM.

Bug: 132114205
Test: make RunSettingsRoboTests
Change-Id: Ie44c56e0f486fd93aff411a0ba0e47d3695a4941
2019-06-03 15:20:33 -07:00
zoey chen
3aa9c79341 UE showed wrong title and message when enabling data roaming.
It set wrong string when building the roaming dialog.

BUG: 133731388
Test: Manual test
Change-Id: Ib46b2b2ba1d62f84da7cd82bbbc03fe4f3069afc
2019-05-31 17:37:26 +08:00
Fan Zhang
ec81d6121e Override 2 getSliceUri() instance to return platform slice
Bug: 126222433
Test: robotest
Change-Id: I3f9c8202d9b75b24b80ebcf385abc95f8df851e2
2019-05-30 16:50:43 -07:00
Christine Franks
3ccc01ca18 Merge "Add SIM color picker" into qt-dev am: b747c5c270
am: c1c4a0858d

Change-Id: I0c4ac5abe7be3eeb2df324b41f13284ed25dea95
2019-05-30 13:35:49 -07:00
Christine Franks
02c4e123b7 Merge "Add SIM color picker" into qt-dev
am: b747c5c270

Change-Id: Ib5f272280d1d23c70412c3112bfcfc432af181ed
2019-05-30 13:26:55 -07:00
Christine Franks
b747c5c270 Merge "Add SIM color picker" into qt-dev 2019-05-30 20:01:48 +00:00
Sunny Shao
27f5a01cef Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev am: 3d16fc9519
am: 9c4fb7ea1d

Change-Id: I2e74ff23833524c00f7fa5730199ce15bd662959
2019-05-30 00:05:20 -07:00
Sunny Shao
0135cde020 Merge "Fix the crash while tapping "app data usage" as second user" into qt-dev
am: 3d16fc9519

Change-Id: Id2aa3c501378686d1b3a1b352b8fa15132bc396f
2019-05-30 00:00:24 -07:00
Christine Franks
8869db9555 Add SIM color picker
Bug: 133193155
Test: make ROBOTEST_FILTER="(RenameMobileNetwork*)" RunSettingsRoboTests -j48

Change-Id: Ifae8b77bc5b4ba1039ede70889468a018f57d78f
2019-05-29 17:03:31 -07:00
Sunny Shao
bddf5149e5 Fix the crash while tapping "app data usage" as second user
Second user or guest is limited some mobile network access. We need to check current user
is admin or not to decide the preferece page will be found in search or not.

Bug: 133466016
Fixes: 133466016
Test: Manual test & make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.network

Change-Id: I48d3064a8aa28ac1f2ac699b42a999b9682b1b52
2019-05-30 06:15:11 +08:00
Antony Sargent
55ac2d75fc Merge "Switch to using an intent for eSIM erasing" into qt-dev
am: f010cb4034

Change-Id: Ia08496db92bd4a432db729d7734bc3bb3b9d6f0a
2019-05-29 13:14:42 -07:00
TreeHugger Robot
f010cb4034 Merge "Switch to using an intent for eSIM erasing" into qt-dev 2019-05-29 20:02:48 +00:00
Amit Mahajan
38b3a56364 Merge "Allow renaming inactive subscriptions." into qt-dev
am: d133a026cd

Change-Id: Ifb4aafad705860d12c02ad3d26a3a36019ad9847
2019-05-29 11:28:13 -07:00
TreeHugger Robot
d133a026cd Merge "Allow renaming inactive subscriptions." into qt-dev 2019-05-29 18:16:40 +00:00
Amit Mahajan
e0285703b2 Allow renaming inactive subscriptions.
Test: manual
Bug: 132922483
Change-Id: I30b4b88ddf53b917081a57bd9a917a51b4b44ec6
2019-05-28 16:03:55 -07:00
Antony Sargent
c6e07c61d0 Switch to using an intent for eSIM erasing
We initially landed support for erasing an eSIM subscription in
ag/7208624 for b/124254555 using our own confirmation/progress UI, and
calling the EuiccManager.deleteSubscription method to do the
deletion. It turns out this is a low-level API which doesn't handle some
important cases such as subscription grouping or the eSIM slot not being
active.

This CL changes Settings to just launch an intent to begin an eSIM
Manager flow to delete a subscription that provides its own
confirmation/progress UI, and should properly handle subscription
grouping and making the eSIM slot active as needed.

Bug: 132114333
Test: make RunSettingsRoboTests
Change-Id: Ie59fea37fa73c5e6573e1181e271ffb5d453bd08
2019-05-28 15:31:51 -07:00
Antony Sargent
3f48938e03 Merge "Add signal strength icons to multi-SIM header" into qt-dev
am: 42c451610e

Change-Id: I99abda9f54a97f0103c926ded07f027fac1d5482
2019-05-28 14:58:13 -07:00
Antony Sargent
223c179cd3 Add signal strength icons to multi-SIM header
When a device is in DSDS mode with multiple SIMs, we show a header on
the Network & internet page with a "connectivity overview", with an
entry for Wi-Fi (if connected) and each active SIM. The icon for Wi-Fi
shows signal strength, but the icons for the active SIMs were just
static; this CL fixes that. It introduces a class for listening to
signal strength changes on a set of subscriptions, and moves some
existing code we had for displaying signal strength (when manually
picking networks for GSM) in NetworkOperatorPreference into a utility
method that can be shared.

Bug: 128855095
Test: make RunSettingsRoboTests
Change-Id: I668cafe1e9f9c3651b1f33783c8538ad9c2732b5
2019-05-28 12:49:08 -07:00
Lei Yu
a444fd99be Merge "Hide network select in some situations" into qt-dev
am: 2bdf358cd1

Change-Id: Ie188d11a05692d49e8fb154e348aa1789098a0c9
2019-05-23 13:59:54 -07:00
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
be3dd8b52e Merge "Fix signal strength display in 'Choose network' list" into qt-dev
am: 13acaddf47

Change-Id: I9a83ace9c11b9d0736e0d8de54aeab12465d4644
2019-05-22 00:54:38 -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
Colin Cross
341544f133 Merge "Use if instead of switch for resources" into qt-dev-plus-aosp 2019-05-14 23:33:25 +00:00
Lei Yu
cdd91541c1 Merge "Add check KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL" into qt-dev
am: 1ffae41f4e

Change-Id: I483907ea77225c8962977d53b9709d681dbf3ac3
2019-05-13 18:05:08 -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
Colin Cross
807e861105 Use if instead of switch for resources
Converting to Soong will move some code from directly compiled
into the app to compiled into an Android library and then
shared between the app and the tests.  This will cause resource
IDs in the library to become non-final, which means they can
no longer be used in case statements.  Convert affect case
statements to if blocks.

Test: m RunSettingsRoboTests
Change-Id: I25742a374f06d3fa4decbfc0d223a350acc50881
2019-05-13 13:42:01 -07:00
Brad Ebinger
96af57b47f Merge "Resolve the SIM call manager per subId" into qt-dev
am: 1350309ecc

Change-Id: I3d5c730efde6c0a8a1ecdba4e70793696ad7a598
2019-05-10 13:39:57 -07:00
Brad Ebinger
1350309ecc Merge "Resolve the SIM call manager per subId" into qt-dev 2019-05-10 20:17:38 +00:00
Andrew Sapperstein
f8058733c2 Merge "Update summary for mobile data toggle for CBRS." into qt-dev
am: cf964643b5

Change-Id: I01bb48fc8bf405d6d807630e01e1f03a14432f9f
2019-05-08 19:01:36 -07: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
Lei Yu
f3cd7b6b17 Merge "Update datausage for DataUsagePreferenceController" into qt-dev
am: 2ace95f386

Change-Id: I09ff46fcb21181976bc96381e9cbc74bf13b6030
2019-05-08 12:56:23 -07:00
TreeHugger Robot
2ace95f386 Merge "Update datausage for DataUsagePreferenceController" into qt-dev 2019-05-08 19:20:13 +00:00
Antony Sargent
a3c46e0543 Merge "Fix two problems related to data connectivity in the multi-SIM header" into qt-dev
am: ea6bd51bea

Change-Id: I32b1142594b2aff558cc3e39e022ea1dfea503dc
2019-05-08 11:59:05 -07: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
Edgar Wang
ed2e1e9a0f Merge "Show admin dialog when preference is disabled by Device Admin" into qt-dev
am: e3278d8240

Change-Id: Ifa70334797f19a2c87b7c361345158e76c136509
2019-05-08 10:32:06 -07: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