Merge "Refactor Cdma preference in ECM" (d7a25690) · Commits · e / os / android_packages_apps_Settings

res/xml/network_setting_fragment.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@

		</PreferenceCategory>

		<ListPreference
		<com.android.settings.network.telephony.cdma.CdmaListPreference
		android:key="cdma_system_select_key"
		android:title="@string/cdma_system_select_title"
		android:summary="@string/cdma_system_select_summary"
		@@ -108,7 +108,7 @@
		android:dialogTitle="@string/cdma_system_select_dialogtitle"
		settings:controller="com.android.settings.network.telephony.cdma.CdmaSystemSelectPreferenceController"/>

		<ListPreference
		<com.android.settings.network.telephony.cdma.CdmaListPreference
		android:key="cdma_subscription_key"
		android:title="@string/cdma_subscription_title"
		android:summary="@string/cdma_subscription_summary"

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

+31 −52

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.settings.network.telephony;
		import static android.provider.Telephony.Carriers.ENFORCE_MANAGED_URI;

		import android.app.ActionBar;
		import android.app.Activity;
		import android.content.BroadcastReceiver;
		import android.content.Context;
		import android.content.Intent;
		@@ -41,6 +42,7 @@ import android.text.TextUtils;
		import android.util.Log;
		import android.view.MenuItem;

		import androidx.annotation.VisibleForTesting;
		import androidx.fragment.app.FragmentActivity;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceCategory;
		@@ -73,6 +75,8 @@ public class MobileNetworkFragment extends DashboardFragment implements
		private static final String LOG_TAG = "NetworkSettings";
		private static final boolean DBG = true;
		public static final int REQUEST_CODE_EXIT_ECM = 17;
		@VisibleForTesting
		static final String KEY_CLICKED_PREF = "key_clicked_pref";

		//String keys for preference lookup
		private static final String BUTTON_PREFERED_NETWORK_MODE = "preferred_network_mode_key";
		@@ -123,9 +127,8 @@ public class MobileNetworkFragment extends DashboardFragment implements

		//GsmUmts options and Cdma options
		GsmUmtsOptions mGsmUmtsOptions;
		CdmaOptions mCdmaOptions;

		private Preference mClickedPreference;
		private String mClickedPrefKey;
		private boolean mShow4GForLTE;
		private boolean mIsGlobalCdma;
		private boolean mOnlyAutoSelectInHomeNW;
		@@ -148,6 +151,7 @@ public class MobileNetworkFragment extends DashboardFragment implements
		return true;
		}
		sendMetricsEventPreferenceClicked(getPreferenceScreen(), preference);
		final String key = preference.getKey();

		/** TODO: Refactor and get rid of the if's using subclasses */
		if (preference.getKey().equals(BUTTON_4G_LTE_KEY)) {
		@@ -155,16 +159,13 @@ public class MobileNetworkFragment extends DashboardFragment implements
		} else if (mGsmUmtsOptions != null &&
		mGsmUmtsOptions.preferenceTreeClick(preference) == true) {
		return true;
		} else if (mCdmaOptions != null &&
		mCdmaOptions.preferenceTreeClick(preference) == true) {
		} else if (TextUtils.equals(key, BUTTON_CDMA_SYSTEM_SELECT_KEY)
		\|\| TextUtils.equals(key, BUTTON_CDMA_SUBSCRIPTION_KEY)) {
		if (mTelephonyManager.getEmergencyCallbackMode()) {

		mClickedPreference = preference;

		// In ECM mode launch ECM app dialog
		startActivityForResult(
		new Intent(TelephonyIntents.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS, null),
		REQUEST_CODE_EXIT_ECM);
		mClickedPrefKey = key;
		}
		return true;
		}
		@@ -262,6 +263,15 @@ public class MobileNetworkFragment extends DashboardFragment implements

		updatePhone();
		Log.i(LOG_TAG, "onCreate:-");

		onRestoreInstance(icicle);
		}

		@VisibleForTesting
		void onRestoreInstance(Bundle icicle) {
		if (icicle != null) {
		mClickedPrefKey = icicle.getString(KEY_CLICKED_PREF);
		}
		}

		@Override
		@@ -342,6 +352,12 @@ public class MobileNetworkFragment extends DashboardFragment implements
		return null;
		}

		@Override
		public void onSaveInstanceState(Bundle outState) {
		super.onSaveInstanceState(outState);
		outState.putString(KEY_CLICKED_PREF, mClickedPrefKey);
		}

		private boolean hasActiveSubscriptions() {
		return mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID;
		}
		@@ -405,9 +421,7 @@ public class MobileNetworkFragment extends DashboardFragment implements
		== ServiceState.STATE_IN_SERVICE) {

		final int phoneType = mTelephonyManager.getPhoneType();
		if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
		updateCdmaOptions(this, prefSet, mSubId);
		} else if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {
		if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {
		updateGsmUmtsOptions(this, prefSet, phoneSubId);
		} else {
		throw new IllegalStateException("Unexpected phone type: " + phoneType);
		@@ -420,7 +434,6 @@ public class MobileNetworkFragment extends DashboardFragment implements
		// set the listener for the mButtonPreferredNetworkMode list preference so we can issue
		// change Preferred Network Mode.

		updateCdmaOptions(this, prefSet, mSubId);
		updateGsmUmtsOptions(this, prefSet, phoneSubId);
		}

		@@ -513,33 +526,17 @@ public class MobileNetworkFragment extends DashboardFragment implements
		return true;
		}

		private boolean is4gLtePrefEnabled(PersistableBundle carrierConfig) {
		return (mTelephonyManager.getCallState(mSubId)
		== TelephonyManager.CALL_STATE_IDLE)
		&& mImsMgr != null
		&& mImsMgr.isNonTtyOrTtyOnVolteEnabled()
		&& carrierConfig.getBoolean(
		CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL);
		}

		@Override
		public void onActivityResult(int requestCode, int resultCode, Intent data) {
		switch (requestCode) {
		case REQUEST_CODE_EXIT_ECM:
		Boolean isChoiceYes = data.getBooleanExtra(
		EXTRA_EXIT_ECM_RESULT, false);
		if (isChoiceYes) {
		// If the phone exits from ECM mode, show the CDMA Options
		final String key = mClickedPreference.getKey();
		if (TextUtils.equals(key,
		mCdmaSystemSelectPreferenceController.getPreferenceKey())) {
		mCdmaSystemSelectPreferenceController.showDialog();
		} else if (TextUtils.equals(key,
		mCdmaSubscriptionPreferenceController.getPreferenceKey())) {
		mCdmaSubscriptionPreferenceController.showDialog();
		if (resultCode != Activity.RESULT_CANCELED) {
		// If the phone exits from ECM mode, show the CDMA
		final Preference preference = getPreferenceScreen()
		.findPreference(mClickedPrefKey);
		if (preference != null) {
		preference.performClick();
		}
		} else {
		// do nothing
		}
		break;

		@@ -624,14 +621,6 @@ public class MobileNetworkFragment extends DashboardFragment implements
		}
		}

		private void controlCdmaOptions(boolean enable) {
		PreferenceScreen prefSet = getPreferenceScreen();
		if (prefSet == null) {
		return;
		}
		updateCdmaOptions(this, prefSet, mSubId);
		}

		private boolean isSupportTdscdma() {
		if (getResources().getBoolean(R.bool.config_support_tdscdma)) {
		return true;
		@@ -733,16 +722,6 @@ public class MobileNetworkFragment extends DashboardFragment implements
		}
		}

		private void updateCdmaOptions(PreferenceFragmentCompat prefFragment, PreferenceScreen prefScreen,
		int subId) {
		// We don't want to re-create CdmaOptions if already exists. Otherwise, the preferences
		// inside it will also be re-created which causes unexpected behavior. For example,
		// the open dialog gets dismissed or detached after pause / resume.
		if (mCdmaOptions == null) {
		mCdmaOptions = new CdmaOptions(prefFragment, prefScreen, subId);
		}
		}

		private static Intent buildPhoneAccountConfigureIntent(
		Context context, PhoneAccountHandle accountHandle) {
		Intent intent = buildConfigureIntent(

src/com/android/settings/network/telephony/cdma/CdmaBasePreferenceController.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -82,6 +82,9 @@ public abstract class CdmaBasePreferenceController extends BasePreferenceControl
		public void displayPreference(PreferenceScreen screen) {
		super.displayPreference(screen);
		mPreference = screen.findPreference(getPreferenceKey());
		if (mPreference instanceof CdmaListPreference) {
		((CdmaListPreference) mPreference).setSubId(mSubId);
		}
		}

		/**

src/com/android/settings/network/telephony/cdma/CdmaListPreference.java

0 → 100644

+46 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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.cdma;

		import android.content.Context;
		import android.telephony.TelephonyManager;
		import android.util.AttributeSet;

		import androidx.preference.ListPreference;

		/**
		* {@link ListPreference} that will launch ECM dialog when in ECM mode
		*/
		public class CdmaListPreference extends ListPreference {
		private TelephonyManager mTelephonyManager;

		public CdmaListPreference(Context context, AttributeSet attrs) {
		super(context, attrs);
		}

		@Override
		protected void onClick() {
		// Only show dialog when it is not in ECM
		if (mTelephonyManager == null \|\| !mTelephonyManager.getEmergencyCallbackMode()) {
		super.onClick();
		}
		}

		public void setSubId(int subId) {
		mTelephonyManager = TelephonyManager.from(getContext()).createForSubscriptionId(subId);
		}
		}

src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -77,14 +77,6 @@ public class CdmaSubscriptionPreferenceController extends CdmaBasePreferenceCont
		return false;
		}

		public void showDialog() {
		final int mode = Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.CDMA_SUBSCRIPTION_MODE, Phone.PREFERRED_CDMA_SUBSCRIPTION);

		mPreference.setValue(Integer.toString(mode));
		mPreferenceManager.showDialog(mPreference);
		}

		@VisibleForTesting
		boolean deviceSupportsNvAndRuim() {
		// retrieve the list of subscription types supported by device.