Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7eee5fc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update string id to make it more generic"

parents c5c7ad87 cf38863a

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -4279,7 +4279,7 @@ 
    <string name="accessibility_autoclick_delay_preference_title">Delay before click</string>















    <!-- Summary text for accessibility service preferences, or preferences including a short description (eg. "ON / High accuracy mode"). -->













    <string name="accessibility_summary_default_combination"><xliff:g id="state" example="ON">%1$s</xliff:g> / <xliff:g id="description" example="High accuracy mode">%2$s</xliff:g></string>













    <string name="preference_summary_default_combination"><xliff:g id="state" example="ON">%1$s</xliff:g> / <xliff:g id="description" example="High accuracy mode">%2$s</xliff:g></string>















    <!-- Preference's state when enabled. Note: UPPERCASE -->















    <string name="accessibility_summary_state_enabled">ON</string>















    <!-- Preference's state when disabled. Note: UPPERCASE -->

































src/com/android/settings/accessibility/AccessibilitySettings.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -493,7 +493,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements













                    getString(R.string.accessibility_summary_state_disabled);















            final CharSequence serviceSummary = info.loadSummary(getPackageManager());















            final String stateSummaryCombo = getString(













                    R.string.accessibility_summary_default_combination,













                    R.string.preference_summary_default_combination,















                    serviceState, serviceSummary);















            preference.setSummary((TextUtils.isEmpty(serviceSummary)) ? serviceState















                    : stateSummaryCombo);