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

Merge "Clean up preference_summary_default_combination in Settings." into main

Browse Source
This commit is contained in:
Yuchen Sun
2024-07-24 04:29:03 +00:00
committed by Android (Google) Code Review
parent 83b2d86ff5 48f304a23f
commit ed3594fe61
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

@@ -12715,9 +12715,6 @@
<!-- Provider Model: Link text to bring the user to "scanning settings" screen. [CHAR LIMIT=NONE]--> <!-- Provider Model: Link text to bring the user to "scanning settings" screen. [CHAR LIMIT=NONE]-->
<string name="wifi_scan_change">Change</string> <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: <!-- Provider Model:
Summary indicating that a SIM has an active mobile data connection [CHAR LIMIT=50] --> Summary indicating that a SIM has an active mobile data connection [CHAR LIMIT=50] -->
<string name="mobile_data_connection_active">Connected</string> <string name="mobile_data_connection_active">Connected</string>

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

@@ -303,7 +303,7 @@ public class AccessibilitySettings extends DashboardFragment implements
final CharSequence serviceSummary = info.loadSummary(context.getPackageManager()); final CharSequence serviceSummary = info.loadSummary(context.getPackageManager());
final String stateSummaryCombo = context.getString( final String stateSummaryCombo = context.getString(
R.string.preference_summary_default_combination, com.android.settingslib.R.string.preference_summary_default_combination,
serviceState, serviceSummary); serviceState, serviceSummary);
return TextUtils.isEmpty(serviceSummary) ? serviceState : stateSummaryCombo; 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 @Override
public CharSequence getSummary() { 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()); 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.accessibility_summary_shortcut_enabled)
: context.getText(R.string.generic_accessibility_feature_shortcut_off); : context.getText(R.string.generic_accessibility_feature_shortcut_off);
final CharSequence featureSummary = context.getText(R.string.magnification_feature_summary); 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); featureState, featureSummary);
} }

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

@@ -264,7 +264,8 @@ public class ProviderModelSliceHelper {
} }
String summary = networkTypeDescription; String summary = networkTypeDescription;
if (isDataSimActive()) { 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), mContext.getString(R.string.mobile_data_connection_active),
networkTypeDescription); networkTypeDescription);
} }

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

@@ -301,7 +301,8 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
return connectionState; return connectionState;
} else { } else {
result = mContext.getString( 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) { } else if (!isDataInService) {
return mContext.getString(R.string.mobile_data_no_connection); return mContext.getString(R.string.mobile_data_no_connection);

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

@@ -169,7 +169,8 @@ public class AccessibilitySettingsTest {
mServiceInfo, SERVICE_ENABLED); mServiceInfo, SERVICE_ENABLED);
assertThat(summary).isEqualTo( 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), mContext.getString(R.string.accessibility_summary_shortcut_enabled),
DEFAULT_SUMMARY)); DEFAULT_SUMMARY));
} }
@@ -184,7 +185,8 @@ public class AccessibilitySettingsTest {
mServiceInfo, SERVICE_ENABLED); mServiceInfo, SERVICE_ENABLED);
assertThat(summary).isEqualTo( 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), mContext.getString(R.string.generic_accessibility_feature_shortcut_off),
DEFAULT_SUMMARY)); DEFAULT_SUMMARY));
} }
@@ -246,7 +248,8 @@ public class AccessibilitySettingsTest {
mServiceInfo, SERVICE_ENABLED).toString(); mServiceInfo, SERVICE_ENABLED).toString();
assertThat(summary).isEqualTo( 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), mContext.getString(R.string.generic_accessibility_service_on),
DEFAULT_SUMMARY)); DEFAULT_SUMMARY));
} }
@@ -260,7 +263,8 @@ public class AccessibilitySettingsTest {
mServiceInfo, SERVICE_ENABLED).toString(); mServiceInfo, SERVICE_ENABLED).toString();
assertThat(summary).isEqualTo( 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), mContext.getString(R.string.generic_accessibility_service_on),
DEFAULT_SUMMARY)); DEFAULT_SUMMARY));
} }
@@ -274,7 +278,8 @@ public class AccessibilitySettingsTest {
mServiceInfo, SERVICE_DISABLED).toString(); mServiceInfo, SERVICE_DISABLED).toString();
assertThat(summary).isEqualTo( 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), mContext.getString(R.string.generic_accessibility_service_off),
DEFAULT_SUMMARY)); DEFAULT_SUMMARY));
} }
@@ -288,7 +293,8 @@ public class AccessibilitySettingsTest {
mServiceInfo, SERVICE_DISABLED).toString(); mServiceInfo, SERVICE_DISABLED).toString();
assertThat(summary).isEqualTo( 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), mContext.getString(R.string.generic_accessibility_service_off),
DEFAULT_SUMMARY)); DEFAULT_SUMMARY));
} }

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

@@ -17,6 +17,7 @@
package com.android.settings.accessibility; package com.android.settings.accessibility;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.robolectric.Shadows.shadowOf; import static org.robolectric.Shadows.shadowOf;
import android.content.Context; import android.content.Context;
@@ -188,7 +189,8 @@ public class CaptioningAppearancePreferenceControllerTest {
R.array.captioning_font_size_selector_titles); R.array.captioning_font_size_selector_titles);
final String[] presetArray = mContext.getResources().getStringArray( final String[] presetArray = mContext.getResources().getStringArray(
R.array.captioning_preset_selector_titles); 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]); fontScaleArray[fontScaleIndex], presetArray[presetIndex]);
} }
} }

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

@@ -1022,7 +1022,9 @@ public class ToggleScreenMagnificationPreferenceFragmentTest {
assertThat( assertThat(
ToggleScreenMagnificationPreferenceFragment.getServiceSummary(mContext).toString()) ToggleScreenMagnificationPreferenceFragment.getServiceSummary(mContext).toString())
.isEqualTo( .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.accessibility_summary_shortcut_enabled),
mContext.getText(R.string.magnification_feature_summary))); mContext.getText(R.string.magnification_feature_summary)));
} }
@@ -1034,7 +1036,9 @@ public class ToggleScreenMagnificationPreferenceFragmentTest {
assertThat( assertThat(
ToggleScreenMagnificationPreferenceFragment.getServiceSummary(mContext).toString()) ToggleScreenMagnificationPreferenceFragment.getServiceSummary(mContext).toString())
.isEqualTo( .isEqualTo(
mContext.getString(R.string.preference_summary_default_combination, mContext.getString(
com.android.settingslib.R.string
.preference_summary_default_combination,
mContext.getText( mContext.getText(
R.string.generic_accessibility_feature_shortcut_off), R.string.generic_accessibility_feature_shortcut_off),
mContext.getText(R.string.magnification_feature_summary))); mContext.getText(R.string.magnification_feature_summary)));
@@ -1049,7 +1053,9 @@ public class ToggleScreenMagnificationPreferenceFragmentTest {
assertThat( assertThat(
ToggleScreenMagnificationPreferenceFragment.getServiceSummary(mContext).toString()) ToggleScreenMagnificationPreferenceFragment.getServiceSummary(mContext).toString())
.isEqualTo( .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.accessibility_summary_shortcut_enabled),
mContext.getText(R.string.magnification_feature_summary))); mContext.getText(R.string.magnification_feature_summary)));
} }
@@ -1063,7 +1069,9 @@ public class ToggleScreenMagnificationPreferenceFragmentTest {
assertThat( assertThat(
ToggleScreenMagnificationPreferenceFragment.getServiceSummary(mContext).toString()) ToggleScreenMagnificationPreferenceFragment.getServiceSummary(mContext).toString())
.isEqualTo( .isEqualTo(
mContext.getString(R.string.preference_summary_default_combination, mContext.getString(
com.android.settingslib.R.string
.preference_summary_default_combination,
mContext.getText( mContext.getText(
R.string.generic_accessibility_feature_shortcut_off), R.string.generic_accessibility_feature_shortcut_off),
mContext.getText(R.string.magnification_feature_summary))); mContext.getText(R.string.magnification_feature_summary)));