PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a plus button to the mobile pref on Network & internet page

Browse Source 
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
This commit is contained in:
Antony Sargent
2019-01-28 16:10:58 -08:00
parent 0b880088a4
commit 59adc31773
8 changed files with 411 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/com/android/settings/network/MobileNetworkSummaryController.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.network;
import static android.telephony.TelephonyManager.MultiSimVariants.UNKNOWN;
import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
@@ -23,6 +25,15 @@ import android.content.Context;
import android.content.Intent;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.telephony.euicc.EuiccManager;
import com.android.settings.R;
import com.android.settings.network.telephony.MobileNetworkActivity;
import com.android.settings.widget.AddPreference;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.List;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
@@ -30,12 +41,6 @@ import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.network.telephony.MobileNetworkActivity;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.List;
public class MobileNetworkSummaryController extends AbstractPreferenceController implements
SubscriptionsChangeListener.SubscriptionsChangeListenerClient, LifecycleObserver {
private static final String TAG = "MobileNetSummaryCtlr";
@@ -44,7 +49,8 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController
private SubscriptionManager mSubscriptionManager;
private SubscriptionsChangeListener mChangeListener;
private PreferenceScreen mScreen;
private TelephonyManager mTelephonyMgr;
private AddPreference mPreference;
/**
* This controls the summary text and click behavior of the "Mobile network" item on the
@@ -64,6 +70,7 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController
public MobileNetworkSummaryController(Context context, Lifecycle lifecycle) {
super(context);
mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
mTelephonyMgr = mContext.getSystemService(TelephonyManager.class);
mChangeListener = new SubscriptionsChangeListener(context, this);
lifecycle.addObserver(this);
}
@@ -82,7 +89,7 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mScreen = screen;
mPreference = screen.findPreference(getPreferenceKey());
}
@Override
@@ -100,29 +107,51 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController
}
}
private void update() {
if (mScreen != null) {
final Preference preference = mScreen.findPreference(getPreferenceKey());
refreshSummary(preference);
final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(
mSubscriptionManager);
private void startAddSimFlow() {
final Intent intent = new Intent(EuiccManager.ACTION_PROVISION_EMBEDDED_SUBSCRIPTION);
mContext.startActivity(intent);
}
preference.setOnPreferenceClickListener(null);
preference.setFragment(null);
if (subs.size() == 0) {
preference.setOnPreferenceClickListener((Preference pref) -> {
// TODO(asargent) - need to get correct intent to fire here
return true;
});
} else if (subs.size() == 1) {
preference.setOnPreferenceClickListener((Preference pref) -> {
final Intent intent = new Intent(mContext, MobileNetworkActivity.class);
mContext.startActivity(intent);
return true;
});
private boolean shouldEnableAddButton() {
// The add button should only show up if the device is in multi-sim mode.
return mTelephonyMgr.getMultiSimConfiguration() != UNKNOWN;
}
private void update() {
if (mPreference == null) {
return;
}
final boolean enableAddButton = shouldEnableAddButton();
refreshSummary(mPreference);
if (!enableAddButton) {
mPreference.setOnAddClickListener(null);
} else {
mPreference.setOnAddClickListener(p -> {
startAddSimFlow();
});
}
final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(
mSubscriptionManager);
mPreference.setOnPreferenceClickListener(null);
mPreference.setFragment(null);
mPreference.setEnabled(true);
if (subs.isEmpty()) {
if (enableAddButton) {
mPreference.setEnabled(false);
} else {
preference.setFragment(MobileNetworkListFragment.class.getCanonicalName());
mPreference.setOnPreferenceClickListener((Preference pref) -> {
startAddSimFlow();
return true;
});
}
} else if (subs.size() == 1) {
mPreference.setOnPreferenceClickListener((Preference pref) -> {
final Intent intent = new Intent(mContext, MobileNetworkActivity.class);
mContext.startActivity(intent);
return true;
});
} else {
mPreference.setFragment(MobileNetworkListFragment.class.getCanonicalName());
}
}
@@ -142,6 +171,7 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController
@Override
public void onSubscriptionsChanged() {
refreshSummary(mPreference);
update();
}
}