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

Commit ed3594fe authored by Yuchen Sun's avatar Yuchen Sun Committed by Android (Google) Code Review
Browse files

Merge "Clean up preference_summary_default_combination in Settings." into main

parents 83b2d86f 48f304a2

res/values/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -12715,9 +12715,6 @@ 
    <!-- Provider Model: Link text to bring the user to "scanning settings" screen. [CHAR LIMIT=NONE]-->

    <string name="wifi_scan_change">Change</string>









    <!-- Summary text separator for preferences including a short description









         (eg. "Connected / 5G"). [CHAR LIMIT=50] -->









    <string name="preference_summary_default_combination"><xliff:g id="state" example="Connected">%1$s</xliff:g> / <xliff:g id="networkMode" example="LTE">%2$s</xliff:g></string>









    <!-- Provider Model:









         Summary indicating that a SIM has an active mobile data connection [CHAR LIMIT=50] -->









    <string name="mobile_data_connection_active">Connected</string>

























src/com/android/settings/accessibility/AccessibilitySettings.java



+1
−1






























Original line number
Diff line number
Diff line







@@ -303,7 +303,7 @@ public class AccessibilitySettings extends DashboardFragment implements

















        final CharSequence serviceSummary = info.loadSummary(context.getPackageManager());









        final String stateSummaryCombo = context.getString(









                R.string.preference_summary_default_combination,









                com.android.settingslib.R.string.preference_summary_default_combination,









                serviceState, serviceSummary);



















        return TextUtils.isEmpty(serviceSummary) ? serviceState : stateSummaryCombo;
































src/com/android/settings/accessibility/CaptioningAppearancePreferenceController.java



+2
−1






























Original line number
Diff line number
Diff line







@@ -42,7 +42,8 @@ public class CaptioningAppearancePreferenceController extends BasePreferenceCont

















    @Override









    public CharSequence getSummary() {









        return mContext.getString(R.string.preference_summary_default_combination,









        return mContext.getString(









                com.android.settingslib.R.string.preference_summary_default_combination,









                geFontScaleSummary(), getPresetSummary());









    }










































src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java



+2
−1






























Original line number
Diff line number
Diff line







@@ -974,7 +974,8 @@ public class ToggleScreenMagnificationPreferenceFragment extends







                ? context.getText(R.string.accessibility_summary_shortcut_enabled)









                : context.getText(R.string.generic_accessibility_feature_shortcut_off);









        final CharSequence featureSummary = context.getText(R.string.magnification_feature_summary);









        return context.getString(R.string.preference_summary_default_combination,









        return context.getString(









                com.android.settingslib.R.string.preference_summary_default_combination,









                featureState, featureSummary);









    }










































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



+2
−1






























Original line number
Diff line number
Diff line







@@ -264,7 +264,8 @@ public class ProviderModelSliceHelper {







        }









        String summary = networkTypeDescription;









        if (isDataSimActive()) {









            summary = mContext.getString(R.string.preference_summary_default_combination,









            summary = mContext.getString(









                    com.android.settingslib.R.string.preference_summary_default_combination,









                    mContext.getString(R.string.mobile_data_connection_active),









                    networkTypeDescription);









        }