Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b64d2b2f authored by SongFerng Wang's avatar SongFerng Wang Committed by Android (Google) Code Review
Browse files

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

parents 86afd10a 9adfa375

res/values/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -10616,15 +10616,12 @@ 
    <string name="wifi_calling_summary">Use Wi\u2011Fi for calls to improve quality</string>









    <!-- Mobile network settings screen, title of Backup calling setting.  [CHAR LIMIT=NONE] -->









    <!-- Deprecated ToDo: b/260059444 remove it next version-->









    <string name="backup_calling_settings_title">Backup calling</string>

















    <!-- Backup calling summary.  [CHAR LIMIT=100] -->









    <!-- Deprecated ToDo: b/260059444 remove it next version-->









    <string name="backup_calling_setting_summary">If <xliff:g id="backup_calling_operator_text" example="Google Fi">%1$s</xliff:g> is unavailable or roaming, use your mobile data SIM for <xliff:g id="backup_calling_carrier_text" example="Google Fi">%1$s</xliff:g> calls.</string>

















    <!-- List of synonyms for the cross SIM calling titles, used to match in settings search [CHAR LIMIT=NONE] -->









    <!-- Deprecated ToDo: b/260059444 remove it next version-->









    <string name="keywords_backup_calling">backup calling</string>

















    <!-- Title for enable MMS notification when trying to receive MMS.  [CHAR LIMIT=40] -->

























res/xml/mobile_network_settings.xml



+8
−0






























Original line number
Diff line number
Diff line







@@ -183,6 +183,14 @@







                android:persistent="true"









                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>



















        <com.android.settings.network.telephony.cdma.CdmaListPreference
































res/xml/network_provider_calls_sms.xml



+8
−0






























Original line number
Diff line number
Diff line







@@ -43,4 +43,12 @@







        settings:controller="com.android.settings.network.telephony.NetworkProviderWifiCallingPreferenceController"









        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>
























src/com/android/settings/network/NetworkProviderCallsSmsFragment.java



+10
−0






























Original line number
Diff line number
Diff line







@@ -26,6 +26,7 @@ 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;








@@ -41,6 +42,9 @@ 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";








@@ -63,6 +67,12 @@ 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;









    }










































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



+0
−1






























Original line number
Diff line number
Diff line







@@ -38,7 +38,6 @@ import java.util.Objects;

















/**









 * Preference controller for "Backup Calling"









 * Deprecated ToDo: b/260059444 remove it next version









 **/









public class BackupCallingPreferenceController extends TelephonyTogglePreferenceController {