Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47 (b09f09b0) · Commits · e / os / android_packages_apps_Settings

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

+15 −4

Original line number	Diff line number	Diff line
		@@ -83,6 +83,10 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere
		/** Called to change the default subscription for the service. */
		protected abstract void setDefaultSubscription(int subscriptionId);

		protected boolean isAskEverytimeSupported() {
		return true;
		}

		@Override
		public int getAvailabilityStatus(int subId) {
		final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions(mManager);
		@@ -123,7 +127,11 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere
		// display subscription based account
		return info.getDisplayName();
		} else {
		if (isAskEverytimeSupported()) {
		return mContext.getString(R.string.calls_and_sms_ask_every_time);
		} else {
		return "";
		}
		}
		}

		@@ -163,9 +171,12 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere
		subIsAvailable = true;
		}
		}

		if (isAskEverytimeSupported()) {
		// Add the extra "Ask every time" value at the end.
		displayNames.add(mContext.getString(R.string.calls_and_sms_ask_every_time));
		subscriptionIds.add(Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
		}

		mPreference.setEntries(displayNames.toArray(new CharSequence[0]));
		mPreference.setEntryValues(subscriptionIds.toArray(new CharSequence[0]));

+9 −0

Original line number	Diff line number	Diff line
		@@ -23,8 +23,12 @@ import android.telephony.SubscriptionManager;

		public class SmsDefaultSubscriptionController extends DefaultSubscriptionController {

		private final boolean mIsAskEverytimeSupported;

		public SmsDefaultSubscriptionController(Context context, String preferenceKey) {
		super(context, preferenceKey);
		mIsAskEverytimeSupported = mContext.getResources()
		.getBoolean(com.android.internal.R.bool.config_sms_ask_every_time_support);
		}

		@Override
		@@ -42,6 +46,11 @@ public class SmsDefaultSubscriptionController extends DefaultSubscriptionControl
		mManager.setDefaultSmsSubId(subscriptionId);
		}

		@Override
		protected boolean isAskEverytimeSupported() {
		return mIsAskEverytimeSupported;
		}

		@Override
		public PhoneAccountHandle getDefaultCallingAccountHandle() {
		// Not supporting calling account override by VoIP