diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml index ae7c9035c2c..ea31b1c109a 100644 --- a/res/xml/mobile_network_settings.xml +++ b/res/xml/mobile_network_settings.xml @@ -53,6 +53,22 @@ settings:keywords="@string/keywords_enhance_4g_lte" settings:controller="com.android.settings.network.telephony.Enhanced4gLtePreferenceController"/> + + + + + + + + m4gLteListeners; + + protected static final int MODE_NONE = -1; + protected static final int MODE_VOLTE = 0; + protected static final int MODE_ADVANCED_CALL = 1; + protected static final int MODE_4G_CALLING = 2; + private int m4gCurrentMode = MODE_NONE; + + public Enhanced4gBasePreferenceController(Context context, String key) { + super(context, key); + mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class); + m4gLteListeners = new ArrayList<>(); + mPhoneStateListener = new PhoneCallStateListener(Looper.getMainLooper()); + } + + public Enhanced4gBasePreferenceController init(int subId) { + if (mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID && mSubId == subId) { + return this; + } + mSubId = subId; + mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId); + mCarrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId); + if (mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) { + mImsManager = ImsManager.getInstance(mContext, SubscriptionManager.getPhoneId(mSubId)); + } + + final boolean show4GForLTE = mCarrierConfig.getBoolean( + CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL); + m4gCurrentMode = mCarrierConfig.getInt( + CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT); + if (m4gCurrentMode != MODE_ADVANCED_CALL) { + m4gCurrentMode = show4GForLTE ? MODE_4G_CALLING : MODE_VOLTE; + } + return this; + } + + @Override + public int getAvailabilityStatus(int subId) { + init(subId); + if (!isModeMatched()) { + return CONDITIONALLY_UNAVAILABLE; + } + final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(subId); + final boolean isVisible = subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID + && mImsManager != null && carrierConfig != null + && mImsManager.isVolteEnabledByPlatform() + && mImsManager.isVolteProvisionedOnDevice() + && MobileNetworkUtils.isImsServiceStateReady(mImsManager) + && !carrierConfig.getBoolean(CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL); + return isVisible + ? (isPrefEnabled() ? AVAILABLE : AVAILABLE_UNSEARCHABLE) + : CONDITIONALLY_UNAVAILABLE; + } + + @Override + public void displayPreference(PreferenceScreen screen) { + super.displayPreference(screen); + mPreference = screen.findPreference(getPreferenceKey()); + } + + @Override + public void onStart() { + mPhoneStateListener.register(mSubId); + } + + @Override + public void onStop() { + mPhoneStateListener.unregister(); + } + + @Override + public void updateState(Preference preference) { + super.updateState(preference); + final SwitchPreference switchPreference = (SwitchPreference) preference; + + switchPreference.setEnabled(isPrefEnabled()); + switchPreference.setChecked(mImsManager.isEnhanced4gLteModeSettingEnabledByUser() + && mImsManager.isNonTtyOrTtyOnVolteEnabled()); + } + + @Override + public boolean setChecked(boolean isChecked) { + mImsManager.setEnhanced4gLteModeSetting(isChecked); + for (final On4gLteUpdateListener lsn : m4gLteListeners) { + lsn.on4gLteUpdated(); + } + return true; + } + + @Override + public boolean isChecked() { + return mImsManager.isEnhanced4gLteModeSettingEnabledByUser(); + } + + public Enhanced4gBasePreferenceController addListener(On4gLteUpdateListener lsn) { + m4gLteListeners.add(lsn); + return this; + } + + protected int getMode() { + return MODE_NONE; + } + + private boolean isModeMatched() { + return m4gCurrentMode == getMode(); + } + + private boolean isPrefEnabled() { + return mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID + && mTelephonyManager.getCallState(mSubId) == TelephonyManager.CALL_STATE_IDLE + && mImsManager != null + && mImsManager.isNonTtyOrTtyOnVolteEnabled() + && mCarrierConfig.getBoolean( + CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL); + } + + private class PhoneCallStateListener extends PhoneStateListener { + + public PhoneCallStateListener(Looper looper) { + super(looper); + } + + @Override + public void onCallStateChanged(int state, String incomingNumber) { + updateState(mPreference); + } + + public void register(int subId) { + mSubId = subId; + mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE); + } + + public void unregister() { + mTelephonyManager.listen(this, PhoneStateListener.LISTEN_NONE); + } + } + + /** + * Update other preferences when 4gLte state is changed + */ + public interface On4gLteUpdateListener { + void on4gLteUpdated(); + } +} diff --git a/src/com/android/settings/network/telephony/Enhanced4gCallingPreferenceController.java b/src/com/android/settings/network/telephony/Enhanced4gCallingPreferenceController.java new file mode 100644 index 00000000000..a0d2e345590 --- /dev/null +++ b/src/com/android/settings/network/telephony/Enhanced4gCallingPreferenceController.java @@ -0,0 +1,34 @@ +/* + * 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; + +/** + * Preference controller for "4G Calling" + */ +public class Enhanced4gCallingPreferenceController extends Enhanced4gBasePreferenceController { + + public Enhanced4gCallingPreferenceController(Context context, String key) { + super(context, key); + } + + @Override + protected int getMode() { + return MODE_4G_CALLING; + } +} diff --git a/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceController.java b/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceController.java index 9069c35b7ff..22cbd97659f 100644 --- a/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceController.java +++ b/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceController.java @@ -17,177 +17,18 @@ package com.android.settings.network.telephony; import android.content.Context; -import android.os.Looper; -import android.os.PersistableBundle; -import android.telephony.CarrierConfigManager; -import android.telephony.PhoneStateListener; -import android.telephony.SubscriptionManager; -import android.telephony.TelephonyManager; - -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - -import com.android.ims.ImsManager; -import com.android.settings.R; -import com.android.settingslib.core.lifecycle.LifecycleObserver; -import com.android.settingslib.core.lifecycle.events.OnStart; -import com.android.settingslib.core.lifecycle.events.OnStop; - -import java.util.ArrayList; -import java.util.List; /** * Preference controller for "Enhanced 4G LTE" */ -public class Enhanced4gLtePreferenceController extends TelephonyTogglePreferenceController - implements LifecycleObserver, OnStart, OnStop { - - private Preference mPreference; - private TelephonyManager mTelephonyManager; - private CarrierConfigManager mCarrierConfigManager; - private PersistableBundle mCarrierConfig; - @VisibleForTesting - ImsManager mImsManager; - private PhoneCallStateListener mPhoneStateListener; - private final List m4gLteListeners; - private final CharSequence[] mVariantTitles; - private final CharSequence[] mVariantSumaries; - - private final int VARIANT_TITLE_VOLTE = 0; - private final int VARIANT_TITLE_ADVANCED_CALL = 1; - private final int VARIANT_TITLE_4G_CALLING = 2; +public class Enhanced4gLtePreferenceController extends Enhanced4gBasePreferenceController { public Enhanced4gLtePreferenceController(Context context, String key) { super(context, key); - mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class); - m4gLteListeners = new ArrayList<>(); - mPhoneStateListener = new PhoneCallStateListener(Looper.getMainLooper()); - mVariantTitles = context.getResources() - .getTextArray(R.array.enhanced_4g_lte_mode_title_variant); - mVariantSumaries = context.getResources() - .getTextArray(R.array.enhanced_4g_lte_mode_sumary_variant); } @Override - public int getAvailabilityStatus(int subId) { - init(subId); - final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(subId); - final boolean isVisible = subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID - && mImsManager != null && carrierConfig != null - && mImsManager.isVolteEnabledByPlatform() - && mImsManager.isVolteProvisionedOnDevice() - && MobileNetworkUtils.isImsServiceStateReady(mImsManager) - && !carrierConfig.getBoolean(CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL); - return isVisible - ? (is4gLtePrefEnabled() ? AVAILABLE : AVAILABLE_UNSEARCHABLE) - : CONDITIONALLY_UNAVAILABLE; - } - - @Override - public void displayPreference(PreferenceScreen screen) { - super.displayPreference(screen); - mPreference = screen.findPreference(getPreferenceKey()); - } - - @Override - public void onStart() { - mPhoneStateListener.register(mSubId); - } - - @Override - public void onStop() { - mPhoneStateListener.unregister(); - } - - @Override - public void updateState(Preference preference) { - super.updateState(preference); - final SwitchPreference switchPreference = (SwitchPreference) preference; - final boolean show4GForLTE = mCarrierConfig.getBoolean( - CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL); - int variant4glteTitleIndex = mCarrierConfig.getInt( - CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT); - - if (variant4glteTitleIndex != VARIANT_TITLE_ADVANCED_CALL) { - variant4glteTitleIndex = show4GForLTE ? VARIANT_TITLE_4G_CALLING : VARIANT_TITLE_VOLTE; - } - - switchPreference.setTitle(mVariantTitles[variant4glteTitleIndex]); - switchPreference.setSummary(mVariantSumaries[variant4glteTitleIndex]); - switchPreference.setEnabled(is4gLtePrefEnabled()); - switchPreference.setChecked(mImsManager.isEnhanced4gLteModeSettingEnabledByUser() - && mImsManager.isNonTtyOrTtyOnVolteEnabled()); - } - - @Override - public boolean setChecked(boolean isChecked) { - mImsManager.setEnhanced4gLteModeSetting(isChecked); - for (final On4gLteUpdateListener lsn : m4gLteListeners) { - lsn.on4gLteUpdated(); - } - return true; - } - - @Override - public boolean isChecked() { - return mImsManager.isEnhanced4gLteModeSettingEnabledByUser(); - } - - public Enhanced4gLtePreferenceController init(int subId) { - if (mSubId == subId) { - return this; - } - mSubId = subId; - mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId); - mCarrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId); - if (mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) { - mImsManager = ImsManager.getInstance(mContext, SubscriptionManager.getPhoneId(mSubId)); - } - - return this; - } - - public Enhanced4gLtePreferenceController addListener(On4gLteUpdateListener lsn) { - m4gLteListeners.add(lsn); - return this; - } - - private boolean is4gLtePrefEnabled() { - return mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID - && mTelephonyManager.getCallState(mSubId) == TelephonyManager.CALL_STATE_IDLE - && mImsManager != null - && mImsManager.isNonTtyOrTtyOnVolteEnabled() - && mCarrierConfig.getBoolean( - CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL); - } - - private class PhoneCallStateListener extends PhoneStateListener { - - public PhoneCallStateListener(Looper looper) { - super(looper); - } - - @Override - public void onCallStateChanged(int state, String incomingNumber) { - updateState(mPreference); - } - - public void register(int subId) { - mSubId = subId; - mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE); - } - - public void unregister() { - mTelephonyManager.listen(this, PhoneStateListener.LISTEN_NONE); - } - } - - /** - * Update other preferences when 4gLte state is changed - */ - public interface On4gLteUpdateListener { - void on4gLteUpdated(); + protected int getMode() { + return MODE_VOLTE; } } diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java index 0a63e739a3b..2dc9f91039a 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java +++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java @@ -32,6 +32,9 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.internal.telephony.TelephonyIntents; import com.android.settings.R; import com.android.settings.core.FeatureFlags; @@ -53,9 +56,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class MobileNetworkSettings extends RestrictedDashboardFragment { @@ -175,6 +175,10 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment { use(VideoCallingPreferenceController.class).init(mSubId); use(Enhanced4gLtePreferenceController.class).init(mSubId) .addListener(videoCallingPreferenceController); + use(Enhanced4gCallingPreferenceController.class).init(mSubId) + .addListener(videoCallingPreferenceController); + use(Enhanced4gAdvancedCallingPreferenceController.class).init(mSubId) + .addListener(videoCallingPreferenceController); } @Override diff --git a/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java b/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java index 1c788638151..a16dc24ee05 100644 --- a/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java +++ b/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java @@ -43,7 +43,7 @@ import com.android.settingslib.core.lifecycle.events.OnStop; */ public class VideoCallingPreferenceController extends TelephonyTogglePreferenceController implements LifecycleObserver, OnStart, OnStop, - Enhanced4gLtePreferenceController.On4gLteUpdateListener { + Enhanced4gBasePreferenceController.On4gLteUpdateListener { private Preference mPreference; private TelephonyManager mTelephonyManager; diff --git a/tests/robotests/assets/grandfather_slice_controller_not_in_xml b/tests/robotests/assets/grandfather_slice_controller_not_in_xml index 55ecffe1246..94d581581bb 100644 --- a/tests/robotests/assets/grandfather_slice_controller_not_in_xml +++ b/tests/robotests/assets/grandfather_slice_controller_not_in_xml @@ -3,6 +3,7 @@ com.android.settings.core.TogglePreferenceControllerTest$FakeToggle com.android.settings.biometrics.face.FaceSettingsAttentionPreferenceController com.android.settings.network.telephony.MmsMessagePreferenceController com.android.settings.network.telephony.DataDuringCallsPreferenceController +com.android.settings.network.telephony.Enhanced4gBasePreferenceController com.android.settings.testutils.FakeToggleController com.android.settings.testutils.FakeSliderController com.android.settings.testutils.FakeInvalidSliderController diff --git a/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java similarity index 58% rename from tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceControllerTest.java rename to tests/robotests/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java index bea8f679604..e4eac68166c 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java @@ -30,7 +30,6 @@ import android.telephony.TelephonyManager; import androidx.preference.SwitchPreference; import com.android.ims.ImsManager; -import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.RestrictedSwitchPreference; @@ -43,7 +42,7 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; @RunWith(RobolectricTestRunner.class) -public class Enhanced4gLtePreferenceControllerTest { +public class Enhanced4gBasePreferenceControllerTest { private static final int SUB_ID = 2; @Mock @@ -85,8 +84,8 @@ public class Enhanced4gLtePreferenceControllerTest { } @Test - public void getAvailabilityStatus_invalidSubId_returnUnavailable() { - mController.init(SubscriptionManager.INVALID_SUBSCRIPTION_ID); + public void getAvailabilityStatus_default_returnUnavailable() { + mController.init(SUB_ID); assertThat(mController.getAvailabilityStatus()).isEqualTo( BasePreferenceController.CONDITIONALLY_UNAVAILABLE); @@ -101,63 +100,6 @@ public class Enhanced4gLtePreferenceControllerTest { BasePreferenceController.CONDITIONALLY_UNAVAILABLE); } - @Test - public void updateState_doNotShow4GForLTE_showVolteTitleAndSummary() { - mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL, false); - - mCarrierConfig.putInt(CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT, 0); - mController.updateState(mPreference); - assertThat(mPreference.getTitle()).isEqualTo( - mContext.getString(R.string.enhanced_4g_lte_mode_title)); - assertThat(mPreference.getSummary()).isEqualTo( - mContext.getString(R.string.enhanced_4g_lte_mode_summary)); - - mCarrierConfig.putInt(CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT, 2); - mController.updateState(mPreference); - assertThat(mPreference.getTitle()).isEqualTo( - mContext.getString(R.string.enhanced_4g_lte_mode_title)); - assertThat(mPreference.getSummary()).isEqualTo( - mContext.getString(R.string.enhanced_4g_lte_mode_summary)); - } - - @Test - public void updateState_show4GForLTE_show4GTitleAndSummary() { - mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL, true); - - mCarrierConfig.putInt(CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT, 0); - mController.updateState(mPreference); - assertThat(mPreference.getTitle()).isEqualTo( - mContext.getString(R.string.enhanced_4g_lte_mode_title_4g_calling)); - assertThat(mPreference.getSummary()).isEqualTo( - mContext.getString(R.string.enhanced_4g_lte_mode_summary_4g_calling)); - - mCarrierConfig.putInt(CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT, 2); - mController.updateState(mPreference); - assertThat(mPreference.getTitle()).isEqualTo( - mContext.getString(R.string.enhanced_4g_lte_mode_title_4g_calling)); - assertThat(mPreference.getSummary()).isEqualTo( - mContext.getString(R.string.enhanced_4g_lte_mode_summary_4g_calling)); - } - - @Test - public void updateState_variantAdvancedCalling_showAdvancedCallingTitleAndSummary() { - mCarrierConfig.putInt(CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT, 1); - - mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL, false); - mController.updateState(mPreference); - assertThat(mPreference.getTitle()).isEqualTo( - mContext.getString(R.string.enhanced_4g_lte_mode_title_advanced_calling)); - assertThat(mPreference.getSummary()).isEqualTo( - mContext.getString(R.string.enhanced_4g_lte_mode_summary)); - - mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL, true); - mController.updateState(mPreference); - assertThat(mPreference.getTitle()).isEqualTo( - mContext.getString(R.string.enhanced_4g_lte_mode_title_advanced_calling)); - assertThat(mPreference.getSummary()).isEqualTo( - mContext.getString(R.string.enhanced_4g_lte_mode_summary)); - } - @Test public void updateState_configEnabled_prefEnabled() { mPreference.setEnabled(false);