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

Merge "Update string id to make it more generic"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-27 23:06:40 +00:00
committed by Android (Google) Code Review
parent c5c7ad875c cf38863a6b
commit c7eee5fcee
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

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

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

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