Commit Graph

2189 Commits

Author SHA1 Message Date
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
Amin Shaikh
e2815e033d Remove duplicate ic_menu_add_white.
Bug: 123829919
Test: mp settingsg
Change-Id: I88e0dde22762eb6bc019361222ffe783b1c15133
2019-02-04 17:59:29 -05:00
markchien
1dd1d79d90 Support entitlement check in DSDS
Get resource from preferred SIM's subId.

Bug: 122108346
Bug: 120069528
Test: atest TetherServiceTest
Change-Id: Ia4279a418dfa6cd14942b7f4d2a313156066381b
2019-02-04 18:55:16 +08:00
Antony Sargent
e13d04c762 Add dialog for changing display name for mobile network
This CL adds a pencil/edit icon at the top of the mobile network details
page. When clicked, it brings up a dialog that allows the user to set
the display name used for that mobile network - this is most useful in
multi-SIM situations. This dialog also displays the mobile network
operator name and phone number which can help the user keep straight
which one they are renaming.

Bug: 122670283
Test: make RunSettingsRoboTests
Change-Id: Ifd63cfb66ce743bd5ba8a06b52229f06ed56b7bd
2019-01-31 12:54:43 -08:00
Antony Sargent
59adc31773 Add a plus button to the mobile pref on Network & internet page
On the Network & internet page, we have a "Mobile network" pref that in
single-SIM mode leads to a detail page for the current SIM. In multi-SIM
mode it has more complicated behavior (leading either to details about
the current subscription if there is only one, or a list of
subscriptions if more than one).

One of the things we wanted to add was a shortcut to add another eSIM
subscription. So this CL adds a plus button control on the right of the
preference which leads to a flow to add another mobile subscription via
the eSIM manager.

Bug: 116349402
Test: make RunSettingsRoboTests
Change-Id: I38e0031e3bd603e93c45dcb4557750e7bc1b8b5a
2019-01-29 12:27:46 -08:00
TreeHugger Robot
4918eedefb Merge "Add Subscription ID to extra when start carrier settings activity." 2019-01-24 21:11:07 +00:00
mavishsu
04bcb42d9c Add Subscription ID to extra when start carrier settings activity.
Bug: 123325237
Test: Manual test
Change-Id: I48cda996bca699e97866ae0d1b7221266cf38df2
2019-01-24 15:20:55 +08:00
Antony Sargent
ff484e11e9 Add default calls/SMS subscription prefs to mobile details page
This adds prefs to the the details page for mobile network subscriptions
that appear in multi-SIM mode. They show which subscription is set as
the default for calls and SMS respectively, and let the user change what
the default is for each. They can be set to either a specific
subscription, or set to "Ask every time".

Bug: 122670283
Test: make RunSettingsRoboTests
Change-Id: Id2b23e4b5c3d1b5c04b5766e73fc8202c05d8f75
2019-01-22 16:59:14 -08:00
TreeHugger Robot
ac73d4e721 Merge "Add data usage header to mobile network details page" 2019-01-19 07:17:33 +00:00
TreeHugger Robot
27c0acbfc9 Merge "Use correct metrics value in MobileNetworkListFragment" 2019-01-19 07:08:25 +00:00
Antony Sargent
210268db3c Use correct metrics value in MobileNetworkListFragment
Bug: 116349402
Test: n/a
Change-Id: I01a81be496c296538e3395931a0fed8098f4da99
2019-01-18 09:36:32 -08:00
Antony Sargent
625787b391 Add data usage header to mobile network details page
As a part of the work for subscriptions UI improvements, we want to show
data usage information at the top of the mobile network details page,
and those details need to be specific to the particular subscription
we're showing details for, even if that SIM isn't the current default
one. This is useful for seeing data usage across your SIMs in dual-SIM
devices.

This CL adapts our already existing DataUsageSummaryPreferenceController
class so that if can be used on any fragment instead of just the
DataUsageSummary one, and changes it to take an explicit subscription
id instead of assuming it should use the default one.

Bug: 122670283
Test: make RunSettingsRoboTests
Change-Id: I41e307b0f32580c73b08adec7cabf01c96d7e835
2019-01-17 21:50:27 -08:00
Fan Zhang
31b210017b Migrate all MetricsProto enums to SettingsEnums
Bug: 122855168
Test: rebuild
Change-Id: I962d9a71179f86b7cae9dc5e9a00e0aa1557dc76
2019-01-17 14:55:42 -08:00
Xiangyu/Malcolm Chen
4c62693cd0 Merge "Don't show hidden Cellular subscription in Settings." 2019-01-16 22:00:50 +00:00
Malcolm Chen
14dde50c3a Don't show hidden Cellular subscription in Settings.
Replace getActiveSubscriptionInfoList() with
getActiveSubscriptionInfoList(true) so that settings will not show
hidden subscriptions to the user in various pages.

Bug: 121396526
Test: manual
Change-Id: I717999fed7d3a5a037914239694bef52df7c6207
2019-01-16 00:21:30 -08:00
Antony Sargent
33340366aa Remove the multi-SIM bottom nav in network and internet v2 mode
When a device has multiple SIMs, at the bottom of the SIM details page
we show a chooser with an icon for each SIM card. This UX design is
being supplanted by the new network and internet v2 design where there
is a list of networks you can get to from the Network & internet
homepage. So when the v2 mode is turned on, we don't want that bottom
navigation to appear.

Bug: 116349402
Test: visual (will remove existing tests for this feature eventually)
Change-Id: I9cae479a1f4e689adcc4f4262661b10edbbbf2d3
2019-01-15 21:59:20 -08:00
Antony Sargent
f4ee4ef3bf Add page listing multiple mobile networks
When a device supports simultaneous connection to multiple mobile
networks, we want the "Mobile network" entry on the Network & internet
page to list the number of active SIMs and when clicked, go to a page
that lists them all.

Bug: 116349402
Test: make RunSettingsRoboTests
Change-Id: Ie642d7801cda07dcbbe74d42c234db6605566be4
2019-01-15 21:57:39 -08:00
TreeHugger Robot
532c3d7200 Merge "Make Network & internet v2 feature flag be persistent" 2019-01-09 01:18:21 +00:00
Antony Sargent
0a830d4f48 Make Network & internet v2 feature flag be persistent
In ag/5386198 we added a flag to turn on the new features of the network
and internet settings page, but that flag resets to the default value
(currently false) every time you reboot, which is annoying and hostile
for dogfooders. This CL makes the flag persistent.

Bug: 116349402
Test: manual / should be covered by existing tests
Change-Id: I098073e81feb199751e967a9652bec6a6445b95e
2019-01-08 14:17:39 -08:00
TreeHugger Robot
2dbdc888c3 Merge "Fix TODO for mobile network settings" 2019-01-07 20:24:13 +00:00
jackqdyulei
b5ce3cd9b0 Fix TODO for mobile network settings
1. Add intent filter to MobileNetworkActivity(new page)
2. Add metrics id
3. Remove obsolete TODOs

Bug: 114749736
Test: Manual
Change-Id: I36f41983dc8cc36ccdf548174fc494044ec1b241
2019-01-04 15:55:09 -08:00
Stanley Wang
242502e5a9 Fix WiFi calling option is showing in search result regardless the carrier supports VoWiFi or not
Change Availability Status to UNSUPPORTED_ON_DEVICE when device doesn't
support VoWiFi.

Change-Id: I8ac501cf7442f1cd7d41f61d2db912d82a9e8c25
Fixes: 120806624
Test: manual and robotests
2019-01-03 13:11:25 +08:00
Pengquan Meng
20e6b01327 Merge "Add PreferenceChangeListener to ApnSettings" am: 66d28c3e37 am: 9745ec5421
am: 1f2ba13698

Change-Id: I6f62e47e04e74cd1d2d9ec7fa3b35032ab8c3ad6
2018-12-27 16:08:07 -08:00
Pengquan Meng
66d28c3e37 Merge "Add PreferenceChangeListener to ApnSettings" 2018-12-27 23:36:18 +00:00
Pengquan Meng
2f434aa7ca Add PreferenceChangeListener to ApnSettings
The PreferenceChangeListener was removed from aosp/779634, when the
selected apn is changed, the result is not saved to the database.

In this CL, we add the PreferenceChangeListener back.

Bug: 121229775
Test: build & manual test
Change-Id: Ief1a2e05c072e5eff8060731b044c19878d346be
2018-12-27 13:27:26 -08:00
Pengquan Meng
92da0c0005 Merge "Set default value for mobile listPreference" 2018-12-23 02:18:20 +00:00
jackqdyulei
6d70582054 Set default value for mobile listPreference
In some cases we don't set value for listPreference, so we need to set
a default one. This is a bug from code migration.

Change-Id: I8072b2a288a6a1254dceabea963f19459b0a9011
Fixes: 119770064
Test: RunSettingsRoboTests
2018-12-21 15:34:42 -08:00
Calvin Pan
e90a5a6812 Merge "Rename SIM_APN_LIST to SIM_APN_URI" am: d594716359 am: a49da46d96
am: 8c758f5ce7

Change-Id: Idbefe3b3cd87e4702852defa7382c30ff8f98e50
2018-12-20 18:34:36 -08:00
Antony Sargent
8e57fedc95 Make taps on subscriptions in multi-network header go to mobile page
This CL does 2 things:

-Makes the MobileNetworkActivity class capable of showing details for
 "available" in addition to just "active" networks. This is useful for
 dual-standby devices where one subscription is active and another is
 registered but not currently active. It also changes the title of this
 screen to be the network display name (defaults to the carrier name
 but can be customized by the user) instead of the generic "Mobile
 network".

-Wires up the subscription entries in the multi-network header (which
 only appears when a device has multiple subscriptions) so that taps on
 a subscription preference bring you to the MobileNetworkActivity screen
 to show details for that network.

Bug: 116349402
Test: make RunSettingsRoboTests
Change-Id: I0e985652c1d8ec3c597b6b6e4426d222e2ad5352
2018-12-20 09:03:34 -08:00
calvinpan
9b56a8b278 Rename SIM_APN_LIST to SIM_APN_URI
In Telephony SIM_APN_LIST had been rename to SIM_APN_URI.

Bug: 120031619
Test: Build pass.
Change-Id: I203c765c7ba6ee468f76dbfdb84b50c787ac8dbe
2018-12-20 07:09:42 +00:00
Antony Sargent
74cb72433a Add wifi connection info to the multi-network header
The Network & internet page will have a dynamic header at the top when
users have more than one mobile subscription, showing information about
connectivity.

This CL adds a preference to this header when there is a wifi connection,
showing the same information as on the wifi-page (connection strength,
speed rating if available, etc.).

Bug: 116349402
Test: make RunSettingsRoboTests
Change-Id: Ia80d6e236a4996b501372ac4cd8e46ba6c5f8841
2018-12-17 13:46:40 -08:00
Antony Sargent
e92e07eb97 Add subscriptions list to the multi-network header
The new UX for showing multiple active mobile plan subscriptions (SIMs,
eSIMs, etc.)  needs a header at the top of the Network & internet page
that shows wifi status and a list of active mobile subscriptions in the
form of one Preference per subscription.

This CL adds display of the mobile subscriptions to this header. It does
not yet show the correct summary text or do anything when you tap on
them - that will be coming in subsequent CLs. Also, since adding a
variable number of items to the top of the page messes up our current
strategy of having a fixed number of hidden items at the bottom based on
overall item count, this CL just makes all items visible. Subsequent CLs
can restore this behavior with dynamic adjustment.

Bug: 116349402
Test: make RunSettingsRoboTests
Change-Id: Ibfadf8cb61f6f5aff6ce38b7974267b1e4ddc719
2018-12-17 13:26:13 -08:00
Josh Hou
e519cd6e68 Refine APN fetching logic
APN fetching logic has been encapsulated in URL_SIM_APN_LIST API in
TelephonyProvider

Bug: 115709816
Test: Live network test
Change-Id: I735bc50e912dfbec0903fbcafdc4d6eaa6ccfc7b
Merged-In: I735bc50e912dfbec0903fbcafdc4d6eaa6ccfc7b
2018-12-17 07:16:50 +00:00