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

Clean up preference_summary_default_combination in Settings.

Browse Source 
Test: Existing tests passed
Flag: EXEMPT clean up
Bug: 328519240
Change-Id: I86996c43243b7a8e2d4b1a83180c189986b3a6ca
This commit is contained in:
Yuchen
2024-07-23 09:16:35 +00:00
committed by Yuchen Sun
parent 7c7cd1be3a
commit 48f304a23f
9 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -12702,9 +12702,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>

2
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -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;

3
src/com/android/settings/accessibility/CaptioningAppearancePreferenceController.java
View File

@@ -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());
}

3
src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
View File

@@ -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);
}

3
src/com/android/settings/network/ProviderModelSliceHelper.java
View File

@@ -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);
}

3
src/com/android/settings/network/SubscriptionsPreferenceController.java
View File

@@ -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);

18
tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
View File

@@ -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));
}

4
tests/robotests/src/com/android/settings/accessibility/CaptioningAppearancePreferenceControllerTest.java
View File

@@ -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]);
}
}

16
tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
View File

@@ -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)));