Merge "Add default calls/SMS subscription prefs to mobile details page"

src/com/android/settings/network/SubscriptionUtil.java

@@ -30,7 +30,7 @@ public class SubscriptionUtil {
     private static List<SubscriptionInfo> sResultsForTesting;
 
     @VisibleForTesting
-    static void setAvailableSubscriptionsForTesting(List<SubscriptionInfo> results) {
+    public static void setAvailableSubscriptionsForTesting(List<SubscriptionInfo> results) {
         sResultsForTesting = results;
     }
 

src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.content.Context;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+
+public class CallsDefaultSubscriptionController extends DefaultSubscriptionController {
+
+    public CallsDefaultSubscriptionController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    protected SubscriptionInfo getDefaultSubscriptionInfo() {
+        return mManager.getDefaultVoiceSubscriptionInfo();
+    }
+
+    @Override
+    protected int getDefaultSubscriptionId() {
+        return SubscriptionManager.getDefaultVoiceSubscriptionId();
+    }
+
+    @Override
+    protected void setDefaultSubscription(int subscriptionId) {
+        mManager.setDefaultVoiceSubId(subscriptionId);
+    }
+}

src/com/android/settings/network/telephony/DefaultSubscriptionController.java

@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
+import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
+
+import android.content.Context;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.network.SubscriptionUtil;
+import com.android.settings.network.SubscriptionsChangeListener;
+
+import java.util.List;
+
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+/**
+ * This implements common controller functionality for a Preference letting the user see/change
+ * what mobile network subscription is used by default for some service controlled by the
+ * SubscriptionManager. This can be used for services such as Calls or SMS.
+ */
+public abstract class DefaultSubscriptionController extends BasePreferenceController implements
+        LifecycleObserver, Preference.OnPreferenceChangeListener,
+        SubscriptionsChangeListener.SubscriptionsChangeListenerClient {
+    private static final String TAG = "DefaultSubController";
+
+    protected SubscriptionsChangeListener mChangeListener;
+    protected ListPreference mPreference;
+    protected SubscriptionManager mManager;
+
+    public DefaultSubscriptionController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+        mManager = context.getSystemService(SubscriptionManager.class);
+        mChangeListener = new SubscriptionsChangeListener(context, this);
+    }
+
+    public void init(Lifecycle lifecycle) {
+        lifecycle.addObserver(this);
+    }
+
+    /** @return SubscriptionInfo for the default subscription for the service, or null if there
+     * isn't one. */
+    protected abstract SubscriptionInfo getDefaultSubscriptionInfo();
+
+    /** @return the id of the default subscription for the service, or
+     * SubscriptionManager.INVALID_SUBSCRIPTION_ID if there isn't one. */
+    protected abstract int getDefaultSubscriptionId();
+
+    /** Called to change the default subscription for the service. */
+    protected abstract void setDefaultSubscription(int subscriptionId);
+
+    @Override
+    public int getAvailabilityStatus() {
+        final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mManager);
+        if (subs.size() > 1) {
+            return AVAILABLE;
+        } else {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+    }
+
+    @OnLifecycleEvent(ON_RESUME)
+    public void onResume() {
+        mChangeListener.start();
+        updateEntries();
+    }
+
+    @OnLifecycleEvent(ON_PAUSE)
+    public void onPause() {
+        mChangeListener.stop();
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+        updateEntries();
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        final SubscriptionInfo info = getDefaultSubscriptionInfo();
+        if (info != null) {
+            return info.getDisplayName();
+        } else {
+            return mContext.getString(R.string.calls_and_sms_ask_every_time);
+        }
+    }
+
+    private void updateEntries() {
+        if (mPreference == null) {
+            return;
+        }
+        if (!isAvailable()) {
+            mPreference.setVisible(false);
+            return;
+        }
+        mPreference.setVisible(true);
+
+        final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mManager);
+
+        // We'll have one entry for each available subscription, plus one for a "ask me every
+        // time" entry at the end.
+        final CharSequence[] displayNames = new CharSequence[subs.size() + 1];
+        final CharSequence[] subscriptionIds = new CharSequence[subs.size() + 1];
+
+        final int serviceDefaultSubId = getDefaultSubscriptionId();
+        boolean subIsAvailable = false;
+
+        int i = 0;
+        for (; i < subs.size(); i++) {
+            displayNames[i] = subs.get(i).getDisplayName();
+            final int subId = subs.get(i).getSubscriptionId();
+            subscriptionIds[i] = Integer.toString(subId);
+            if (subId == serviceDefaultSubId) {
+                subIsAvailable = true;
+            }
+        }
+        // Add the extra "Ask every time" value at the end.
+        displayNames[i] = mContext.getString(R.string.calls_and_sms_ask_every_time);
+        subscriptionIds[i] = Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+
+        mPreference.setEntries(displayNames);
+        mPreference.setEntryValues(subscriptionIds);
+
+        if (subIsAvailable) {
+            mPreference.setValue(Integer.toString(serviceDefaultSubId));
+        } else {
+            mPreference.setValue(Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final int subscriptionId = Integer.parseInt((String) newValue);
+        setDefaultSubscription(subscriptionId);
+        refreshSummary(mPreference);
+        return true;
+    }
+
+    @Override
+    public void onAirplaneModeChanged(boolean airplaneModeEnabled) {
+    }
+
+    @Override
+    public void onSubscriptionsChanged() {
+        if (mPreference != null) {
+            updateEntries();
+            refreshSummary(mPreference);
+        }
+    }
+}

src/com/android/settings/network/telephony/MobileNetworkSettings.java

@@ -126,6 +126,10 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment {
     public void onAttach(Context context) {
         super.onAttach(context);
 
+        if (FeatureFlagPersistent.isEnabled(getContext(), FeatureFlags.NETWORK_INTERNET_V2)) {
+          use(CallsDefaultSubscriptionController.class).init(getLifecycle());
+          use(SmsDefaultSubscriptionController.class).init(getLifecycle());
+        }
         use(MobileDataPreferenceController.class).init(getFragmentManager(), mSubId);
         use(RoamingPreferenceController.class).init(getFragmentManager(), mSubId);
         use(ApnPreferenceController.class).init(mSubId);

src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.content.Context;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+
+public class SmsDefaultSubscriptionController extends DefaultSubscriptionController {
+
+    public SmsDefaultSubscriptionController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    protected SubscriptionInfo getDefaultSubscriptionInfo() {
+        return mManager.getDefaultSmsSubscriptionInfo();
+    }
+
+    @Override
+    protected int getDefaultSubscriptionId() {
+        return SubscriptionManager.getDefaultSmsSubscriptionId();
+    }
+
+    @Override
+    protected void setDefaultSubscription(int subscriptionId) {
+        mManager.setDefaultSmsSubId(subscriptionId);
+    }
+}