Android/packages_apps_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

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