Merge "Remove "Backup Calling" button from Settings UI"
This commit is contained in:
@@ -23,10 +23,8 @@ import android.os.UserManager;
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
|
||||
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 +40,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 +62,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;
|
||||
}
|
||||
|
||||
|
@@ -280,11 +280,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)
|
||||
|
Reference in New Issue
Block a user