PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove "Backup Calling" button from Settings UI"

Browse Source
This commit is contained in:
Aswin Sankar
2023-02-15 02:22:56 +00:00
committed by Android (Google) Code Review
parent 3ce2b2e85b 812b59b981
commit eaa2fa8e7a
4 changed files with 0 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/xml/mobile_network_settings.xml
View File

@@ -183,14 +183,6 @@
android:persistent="true" android:persistent="true"
settings:controller="com.android.settings.network.telephony.VideoCallingPreferenceController"/> settings:controller="com.android.settings.network.telephony.VideoCallingPreferenceController"/>
<SwitchPreference
android:key="backup_calling_key"
android:title="@string/backup_calling_settings_title"
android:persistent="false"
android:summary="@string/backup_calling_setting_summary"
settings:keywords="@string/keywords_backup_calling"
settings:controller="com.android.settings.network.telephony.BackupCallingPreferenceController"/>
</PreferenceCategory> </PreferenceCategory>
<com.android.settings.network.telephony.cdma.CdmaListPreference <com.android.settings.network.telephony.cdma.CdmaListPreference

8
res/xml/network_provider_calls_sms.xml
View File

@@ -43,12 +43,4 @@
settings:controller="com.android.settings.network.telephony.NetworkProviderWifiCallingPreferenceController" settings:controller="com.android.settings.network.telephony.NetworkProviderWifiCallingPreferenceController"
settings:allowDividerAbove="true" settings:allowDividerAbove="true"
/> />
<PreferenceCategory
android:key="provider_model_backup_calling_category"
android:title="@string/backup_calling_settings_title"
android:order="25"
settings:controller="com.android.settings.network.telephony.NetworkProviderBackupCallingPreferenceController"
settings:allowDividerAbove="true"
/>
</PreferenceScreen> </PreferenceScreen>

11
src/com/android/settings/network/NetworkProviderCallsSmsFragment.java
View File

@@ -23,10 +23,8 @@ import android.os.UserManager;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.network.telephony.CallsDefaultSubscriptionController; 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.NetworkProviderWifiCallingPreferenceController;
import com.android.settings.network.telephony.SmsDefaultSubscriptionController; import com.android.settings.network.telephony.SmsDefaultSubscriptionController;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
@@ -42,9 +40,6 @@ public class NetworkProviderCallsSmsFragment extends DashboardFragment {
static final String LOG_TAG = "NetworkProviderCallsSmsFragment"; static final String LOG_TAG = "NetworkProviderCallsSmsFragment";
@VisibleForTesting @VisibleForTesting
static final String KEY_PREFERENCE_CATEGORY_CALLING = "provider_model_calling_category"; 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 @VisibleForTesting
static final String KEY_PREFERENCE_CALLS= "provider_model_calls_preference"; static final String KEY_PREFERENCE_CALLS= "provider_model_calls_preference";
@@ -67,12 +62,6 @@ public class NetworkProviderCallsSmsFragment extends DashboardFragment {
mNetworkProviderWifiCallingPreferenceController.init(getSettingsLifecycle()); mNetworkProviderWifiCallingPreferenceController.init(getSettingsLifecycle());
controllers.add(mNetworkProviderWifiCallingPreferenceController); controllers.add(mNetworkProviderWifiCallingPreferenceController);
NetworkProviderBackupCallingPreferenceController backupCallingPrefCtrl =
new NetworkProviderBackupCallingPreferenceController(context,
KEY_PREFERENCE_CATEGORY_BACKUP_CALLING);
backupCallingPrefCtrl.init(getSettingsLifecycle());
controllers.add(backupCallingPrefCtrl);
return controllers; return controllers;
} }

5
src/com/android/settings/network/telephony/MobileNetworkSettings.java
View File

@@ -280,11 +280,6 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings impleme
final VideoCallingPreferenceController videoCallingPreferenceController = final VideoCallingPreferenceController videoCallingPreferenceController =
use(VideoCallingPreferenceController.class).init(mSubId); 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) use(Enhanced4gLtePreferenceController.class).init(mSubId)
.addListener(videoCallingPreferenceController); .addListener(videoCallingPreferenceController);
use(Enhanced4gCallingPreferenceController.class).init(mSubId) use(Enhanced4gCallingPreferenceController.class).init(mSubId)