From fa589ca6f1e489fbf0da1a18b07f9be2b18d7b64 Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Tue, 22 Nov 2022 18:58:52 +0800 Subject: [PATCH] Remove "Backup Calling" button from Settings UI Remove "Backup Calling" button from Settings UI, keep it always enabled. Bug: 253698238 Test: build pass Change-Id: Iff2665829e559ab7dce20e58a50ca75b8dcd6f83 --- res/values/strings.xml | 3 +++ res/xml/mobile_network_settings.xml | 8 -------- res/xml/network_provider_calls_sms.xml | 8 -------- .../network/NetworkProviderCallsSmsFragment.java | 10 ---------- .../telephony/BackupCallingPreferenceController.java | 1 + .../network/telephony/MobileNetworkSettings.java | 5 ----- .../telephony/NetworkProviderBackupCallingGroup.java | 1 + ...tworkProviderBackupCallingPreferenceController.java | 1 + .../BackupCallingPreferenceControllerTest.java | 5 +++++ .../NetworkProviderBackupCallingGroupTest.java | 8 ++++++++ 10 files changed, 19 insertions(+), 31 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 2dc4e655b92..91587a90633 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -10510,12 +10510,15 @@ Use Wi\u2011Fi for calls to improve quality + Backup calling + If %1$s is unavailable or roaming, use your mobile data SIM for %1$s calls. + backup calling diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml index 96eacbc7349..22434b1ddc2 100644 --- a/res/xml/mobile_network_settings.xml +++ b/res/xml/mobile_network_settings.xml @@ -183,14 +183,6 @@ android:persistent="true" settings:controller="com.android.settings.network.telephony.VideoCallingPreferenceController"/> - - - - diff --git a/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java b/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java index ab247f1a87c..772db452fcf 100644 --- a/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java +++ b/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java @@ -26,7 +26,6 @@ import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.network.telephony.CallsDefaultSubscriptionController; -import com.android.settings.network.telephony.NetworkProviderBackupCallingPreferenceController; import com.android.settings.network.telephony.NetworkProviderWifiCallingPreferenceController; import com.android.settings.network.telephony.SmsDefaultSubscriptionController; import com.android.settings.search.BaseSearchIndexProvider; @@ -42,9 +41,6 @@ public class NetworkProviderCallsSmsFragment extends DashboardFragment { static final String LOG_TAG = "NetworkProviderCallsSmsFragment"; @VisibleForTesting static final String KEY_PREFERENCE_CATEGORY_CALLING = "provider_model_calling_category"; - @VisibleForTesting - static final String KEY_PREFERENCE_CATEGORY_BACKUP_CALLING = - "provider_model_backup_calling_category"; @VisibleForTesting static final String KEY_PREFERENCE_CALLS= "provider_model_calls_preference"; @@ -67,12 +63,6 @@ public class NetworkProviderCallsSmsFragment extends DashboardFragment { mNetworkProviderWifiCallingPreferenceController.init(getSettingsLifecycle()); controllers.add(mNetworkProviderWifiCallingPreferenceController); - NetworkProviderBackupCallingPreferenceController backupCallingPrefCtrl = - new NetworkProviderBackupCallingPreferenceController(context, - KEY_PREFERENCE_CATEGORY_BACKUP_CALLING); - backupCallingPrefCtrl.init(getSettingsLifecycle()); - controllers.add(backupCallingPrefCtrl); - return controllers; } diff --git a/src/com/android/settings/network/telephony/BackupCallingPreferenceController.java b/src/com/android/settings/network/telephony/BackupCallingPreferenceController.java index 4f64399f524..3db6dfe87e8 100644 --- a/src/com/android/settings/network/telephony/BackupCallingPreferenceController.java +++ b/src/com/android/settings/network/telephony/BackupCallingPreferenceController.java @@ -38,6 +38,7 @@ import java.util.Objects; /** * Preference controller for "Backup Calling" + * Deprecated ToDo: b/260059444 remove it next version **/ public class BackupCallingPreferenceController extends TelephonyTogglePreferenceController { diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java index ae83c43c5bc..df7fd839e68 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java +++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java @@ -269,11 +269,6 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings impleme final VideoCallingPreferenceController videoCallingPreferenceController = use(VideoCallingPreferenceController.class).init(mSubId); - final BackupCallingPreferenceController crossSimCallingPreferenceController = - use(BackupCallingPreferenceController.class).init(mSubId); - use(CallingPreferenceCategoryController.class).setChildren( - Arrays.asList(wifiCallingPreferenceController, videoCallingPreferenceController, - crossSimCallingPreferenceController)); use(Enhanced4gLtePreferenceController.class).init(mSubId) .addListener(videoCallingPreferenceController); use(Enhanced4gCallingPreferenceController.class).init(mSubId) diff --git a/src/com/android/settings/network/telephony/NetworkProviderBackupCallingGroup.java b/src/com/android/settings/network/telephony/NetworkProviderBackupCallingGroup.java index 58dd18f2c62..3659f651336 100644 --- a/src/com/android/settings/network/telephony/NetworkProviderBackupCallingGroup.java +++ b/src/com/android/settings/network/telephony/NetworkProviderBackupCallingGroup.java @@ -49,6 +49,7 @@ import java.util.Map; /** * Preference controller for "Backup Calling" + * Deprecated ToDo: b/260059444 remove it next version **/ public class NetworkProviderBackupCallingGroup extends TelephonyTogglePreferenceController implements LifecycleObserver, diff --git a/src/com/android/settings/network/telephony/NetworkProviderBackupCallingPreferenceController.java b/src/com/android/settings/network/telephony/NetworkProviderBackupCallingPreferenceController.java index 5c336efc507..c10bfb83d7c 100644 --- a/src/com/android/settings/network/telephony/NetworkProviderBackupCallingPreferenceController.java +++ b/src/com/android/settings/network/telephony/NetworkProviderBackupCallingPreferenceController.java @@ -32,6 +32,7 @@ import java.util.List; /** * Preference controller for "Backup Calling" summary list + * Deprecated ToDo: b/260059444 remove it next version */ public class NetworkProviderBackupCallingPreferenceController extends BasePreferenceController implements LifecycleObserver { diff --git a/tests/unit/src/com/android/settings/network/telephony/BackupCallingPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/BackupCallingPreferenceControllerTest.java index 4e110f0d018..34d7c925b40 100644 --- a/tests/unit/src/com/android/settings/network/telephony/BackupCallingPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/BackupCallingPreferenceControllerTest.java @@ -28,9 +28,13 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import com.android.settings.core.BasePreferenceController; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +/** + * Deprecated ToDo: b/260059444 remove it next version + */ @RunWith(AndroidJUnit4.class) public class BackupCallingPreferenceControllerTest { private static final int SUB_ID = 2; @@ -47,6 +51,7 @@ public class BackupCallingPreferenceControllerTest { } @Test + @Ignore public void controller_isUnavailable() { assertThat(mController.getAvailabilityStatus()) .isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE); diff --git a/tests/unit/src/com/android/settings/network/telephony/NetworkProviderBackupCallingGroupTest.java b/tests/unit/src/com/android/settings/network/telephony/NetworkProviderBackupCallingGroupTest.java index a5717ef519a..09f020085f3 100644 --- a/tests/unit/src/com/android/settings/network/telephony/NetworkProviderBackupCallingGroupTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/NetworkProviderBackupCallingGroupTest.java @@ -40,6 +40,7 @@ import com.android.settings.network.CarrierConfigCache; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -47,6 +48,9 @@ import org.mockito.MockitoAnnotations; import java.util.List; +/** + * Deprecated ToDo: b/260059444 remove it next version + */ @RunWith(AndroidJUnit4.class) public class NetworkProviderBackupCallingGroupTest { @@ -133,12 +137,14 @@ public class NetworkProviderBackupCallingGroupTest { } @Test + @Ignore public void shouldShowBackupCallingForSub_invalidSubId_returnFalse() { assertThat(mNetworkProviderBackupCallingGroup.hasBackupCallingFeature( SubscriptionManager.INVALID_SUBSCRIPTION_ID)).isEqualTo(false); } @Test + @Ignore public void shouldShowBackupCallingForSub_carrierConfigIsUnavailable_returnFalse() { mCarrierConfig.putBoolean(CarrierConfigManager.KEY_CARRIER_CROSS_SIM_IMS_AVAILABLE_BOOL, false); @@ -148,6 +154,7 @@ public class NetworkProviderBackupCallingGroupTest { } @Test + @Ignore public void shouldShowBackupCallingForSub_crossSimDisabled_returnFalse() { doReturn(false).when(mNetworkProviderBackupCallingGroup).isCrossSimEnabledByPlatform( @@ -158,6 +165,7 @@ public class NetworkProviderBackupCallingGroupTest { } @Test + @Ignore public void shouldBackupCallingForSub_crossSimEnabled_returnTrue() { doReturn(true).when(mNetworkProviderBackupCallingGroup).isCrossSimEnabledByPlatform( mContext, SUB_ID_1);