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

Commit 6413604b authored by Saige McVea's avatar Saige McVea
Browse files

Resolved accessibility service preference summary strings to use a common resource. 

Test: Manual

Bug: 34682532

Change-Id: Idf617fb5008181a0739689e40fef6b3a86aaf72b
parent 510a1a69

res/values/strings.xml

+7 −0
Original line number Diff line number Diff line
@@ -4084,6 +4084,13 @@ 
    <!-- Title for accessibility preference for configuring amount of time that has to pass after pointer stops moving before click action can be performed (if automatic click after pointer stops moving feature is enabled). [CHAR LIMIT=NONE] -->

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









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









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









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









    <string name="accessibility_summary_state_disabled">OFF</string>

















    <!-- Title for the preference to show a tile for a particular feature in the Quick Settings pane. [CHAR LIMIT=NONE] -->









    <string name="enable_quick_setting">Show in Quick Settings</string>









    <!-- Title for the preference to configure the type of color space correction to apply. [CHAR LIMIT=NONE] -->
































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



+9
−7






























Original line number
Diff line number
Diff line







@@ -544,12 +544,15 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements







            preference.setIcon(icon);









            final boolean serviceEnabled = accessibilityEnabled









                    && enabledServices.contains(componentName);









            String serviceState = serviceEnabled ?









                    getString(R.string.accessibility_feature_state_on) :









                    getString(R.string.accessibility_feature_state_off);









            String serviceSummary = info.loadSummary(getPackageManager());









            serviceSummary = (TextUtils.isEmpty(serviceSummary)) ? serviceState :









                    serviceSummary;









            final String serviceState = serviceEnabled ?









                    getString(R.string.accessibility_summary_state_enabled) :









                    getString(R.string.accessibility_summary_state_disabled);









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









            final String stateSummaryCombo = getString(









                    R.string.accessibility_summary_default_combination,









                    serviceState, serviceSummary);









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









                    : stateSummaryCombo);



















            // Disable all accessibility services that are not permitted.









            boolean serviceAllowed =








@@ -566,7 +569,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements







                preference.setEnabled(true);









            }



















            preference.setSummary(serviceSummary);









            preference.setFragment(ToggleAccessibilityServicePreferenceFragment.class.getName());









            preference.setPersistent(true);