Merge "Clean up preference_summary_default_combination in Settings." into main

2024-07-24 04:29:03 +00:00
parent 83b2d86ff5 48f304a23f
commit ed3594fe61
9 changed files with 36 additions and 19 deletions
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -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;