From 48f304a23fbe96ca735d99456603d397d586dece Mon Sep 17 00:00:00 2001 From: Yuchen Date: Tue, 23 Jul 2024 09:16:35 +0000 Subject: [PATCH] Clean up preference_summary_default_combination in Settings. Test: Existing tests passed Flag: EXEMPT clean up Bug: 328519240 Change-Id: I86996c43243b7a8e2d4b1a83180c189986b3a6ca --- res/values/strings.xml | 3 --- .../accessibility/AccessibilitySettings.java | 2 +- ...ptioningAppearancePreferenceController.java | 3 ++- ...eScreenMagnificationPreferenceFragment.java | 3 ++- .../network/ProviderModelSliceHelper.java | 3 ++- .../SubscriptionsPreferenceController.java | 3 ++- .../AccessibilitySettingsTest.java | 18 ++++++++++++------ ...ningAppearancePreferenceControllerTest.java | 4 +++- ...eenMagnificationPreferenceFragmentTest.java | 16 ++++++++++++---- 9 files changed, 36 insertions(+), 19 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 79250c242fa..bd80718a788 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -12702,9 +12702,6 @@ Change - - %1$s / %2$s Connected diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index 23f8ec7fab1..e7e002c6528 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -302,7 +302,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; diff --git a/src/com/android/settings/accessibility/CaptioningAppearancePreferenceController.java b/src/com/android/settings/accessibility/CaptioningAppearancePreferenceController.java index 74cb534805e..700a013eb39 100644 --- a/src/com/android/settings/accessibility/CaptioningAppearancePreferenceController.java +++ b/src/com/android/settings/accessibility/CaptioningAppearancePreferenceController.java @@ -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()); } diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java index 34ed5cb1a13..e339cb42505 100644 --- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java @@ -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); } diff --git a/src/com/android/settings/network/ProviderModelSliceHelper.java b/src/com/android/settings/network/ProviderModelSliceHelper.java index 686990b8837..c60594ddecd 100644 --- a/src/com/android/settings/network/ProviderModelSliceHelper.java +++ b/src/com/android/settings/network/ProviderModelSliceHelper.java @@ -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); } diff --git a/src/com/android/settings/network/SubscriptionsPreferenceController.java b/src/com/android/settings/network/SubscriptionsPreferenceController.java index d9a64646aef..b7ed31eda56 100644 --- a/src/com/android/settings/network/SubscriptionsPreferenceController.java +++ b/src/com/android/settings/network/SubscriptionsPreferenceController.java @@ -301,7 +301,8 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl return connectionState; } else { result = mContext.getString( - R.string.preference_summary_default_combination, connectionState, result); + com.android.settingslib.R.string.preference_summary_default_combination, + connectionState, result); } } else if (!isDataInService) { return mContext.getString(R.string.mobile_data_no_connection); diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java index 1463cd0b7f9..02fa422f116 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java @@ -174,7 +174,8 @@ public class AccessibilitySettingsTest { mServiceInfo, SERVICE_ENABLED); assertThat(summary).isEqualTo( - mContext.getString(R.string.preference_summary_default_combination, + mContext.getString( + com.android.settingslib.R.string.preference_summary_default_combination, mContext.getString(R.string.accessibility_summary_shortcut_enabled), DEFAULT_SUMMARY)); } @@ -189,7 +190,8 @@ public class AccessibilitySettingsTest { mServiceInfo, SERVICE_ENABLED); assertThat(summary).isEqualTo( - mContext.getString(R.string.preference_summary_default_combination, + mContext.getString( + com.android.settingslib.R.string.preference_summary_default_combination, mContext.getString(R.string.generic_accessibility_feature_shortcut_off), DEFAULT_SUMMARY)); } @@ -251,7 +253,8 @@ public class AccessibilitySettingsTest { mServiceInfo, SERVICE_ENABLED).toString(); assertThat(summary).isEqualTo( - mContext.getString(R.string.preference_summary_default_combination, + mContext.getString( + com.android.settingslib.R.string.preference_summary_default_combination, mContext.getString(R.string.generic_accessibility_service_on), DEFAULT_SUMMARY)); } @@ -265,7 +268,8 @@ public class AccessibilitySettingsTest { mServiceInfo, SERVICE_ENABLED).toString(); assertThat(summary).isEqualTo( - mContext.getString(R.string.preference_summary_default_combination, + mContext.getString( + com.android.settingslib.R.string.preference_summary_default_combination, mContext.getString(R.string.generic_accessibility_service_on), DEFAULT_SUMMARY)); } @@ -279,7 +283,8 @@ public class AccessibilitySettingsTest { mServiceInfo, SERVICE_DISABLED).toString(); assertThat(summary).isEqualTo( - mContext.getString(R.string.preference_summary_default_combination, + mContext.getString( + com.android.settingslib.R.string.preference_summary_default_combination, mContext.getString(R.string.generic_accessibility_service_off), DEFAULT_SUMMARY)); } @@ -293,7 +298,8 @@ public class AccessibilitySettingsTest { mServiceInfo, SERVICE_DISABLED).toString(); assertThat(summary).isEqualTo( - mContext.getString(R.string.preference_summary_default_combination, + mContext.getString( + com.android.settingslib.R.string.preference_summary_default_combination, mContext.getString(R.string.generic_accessibility_service_off), DEFAULT_SUMMARY)); } diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningAppearancePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningAppearancePreferenceControllerTest.java index b9de66db482..b4dd2fc49a6 100644 --- a/tests/robotests/src/com/android/settings/accessibility/CaptioningAppearancePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningAppearancePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.accessibility; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.Shadows.shadowOf; import android.content.Context; @@ -188,7 +189,8 @@ public class CaptioningAppearancePreferenceControllerTest { R.array.captioning_font_size_selector_titles); final String[] presetArray = mContext.getResources().getStringArray( R.array.captioning_preset_selector_titles); - return mContext.getString(R.string.preference_summary_default_combination, + return mContext.getString( + com.android.settingslib.R.string.preference_summary_default_combination, fontScaleArray[fontScaleIndex], presetArray[presetIndex]); } } diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java index 6f9981a9c1f..ea6504a3d55 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java @@ -1022,7 +1022,9 @@ public class ToggleScreenMagnificationPreferenceFragmentTest { assertThat( ToggleScreenMagnificationPreferenceFragment.getServiceSummary(mContext).toString()) .isEqualTo( - mContext.getString(R.string.preference_summary_default_combination, + mContext.getString( + com.android.settingslib.R.string + .preference_summary_default_combination, mContext.getText(R.string.accessibility_summary_shortcut_enabled), mContext.getText(R.string.magnification_feature_summary))); } @@ -1034,7 +1036,9 @@ public class ToggleScreenMagnificationPreferenceFragmentTest { assertThat( ToggleScreenMagnificationPreferenceFragment.getServiceSummary(mContext).toString()) .isEqualTo( - mContext.getString(R.string.preference_summary_default_combination, + mContext.getString( + com.android.settingslib.R.string + .preference_summary_default_combination, mContext.getText( R.string.generic_accessibility_feature_shortcut_off), mContext.getText(R.string.magnification_feature_summary))); @@ -1049,7 +1053,9 @@ public class ToggleScreenMagnificationPreferenceFragmentTest { assertThat( ToggleScreenMagnificationPreferenceFragment.getServiceSummary(mContext).toString()) .isEqualTo( - mContext.getString(R.string.preference_summary_default_combination, + mContext.getString( + com.android.settingslib.R.string + .preference_summary_default_combination, mContext.getText(R.string.accessibility_summary_shortcut_enabled), mContext.getText(R.string.magnification_feature_summary))); } @@ -1063,7 +1069,9 @@ public class ToggleScreenMagnificationPreferenceFragmentTest { assertThat( ToggleScreenMagnificationPreferenceFragment.getServiceSummary(mContext).toString()) .isEqualTo( - mContext.getString(R.string.preference_summary_default_combination, + mContext.getString( + com.android.settingslib.R.string + .preference_summary_default_combination, mContext.getText( R.string.generic_accessibility_feature_shortcut_off), mContext.getText(R.string.magnification_feature_summary)));