diff --git a/res/values/strings.xml b/res/values/strings.xml index 8a642ac1fa9..577c39f7e92 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5144,30 +5144,20 @@ Blue-yellow - - - Extremely short delay (%1$s second) - Extremely short delay (%1$s seconds) - - - - Very short delay (%1$s second) - Very short delay (%1$s seconds) - - Short delay (%1$s second) - Short delay (%1$s seconds) + Short (%1$s second) + Short (%1$s seconds) + + + + Medium (%1$s second) + Medium (%1$s seconds) - Long delay (%1$s second) - Long delay (%1$s seconds) - - - - Very long delay (%1$s second) - Very long delay (%1$s seconds) + Long (%1$s second) + Long (%1$s seconds) diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java index 5e09b2a78c1..6624457ad98 100644 --- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java @@ -64,12 +64,10 @@ public class ToggleAutoclickPreferenceFragment extends DashboardFragment * Resource ids from which autoclick preference summaries should be derived. The strings have * placeholder for integer delay value. */ - private static final int[] mAutoclickPreferenceSummaries = { - R.plurals.accessibilty_autoclick_preference_subtitle_extremely_short_delay, - R.plurals.accessibilty_autoclick_preference_subtitle_very_short_delay, + private static final int[] AUTOCLICK_PREFERENCE_SUMMARIES = { R.plurals.accessibilty_autoclick_preference_subtitle_short_delay, - R.plurals.accessibilty_autoclick_preference_subtitle_long_delay, - R.plurals.accessibilty_autoclick_preference_subtitle_very_long_delay + R.plurals.accessibilty_autoclick_preference_subtitle_medium_delay, + R.plurals.accessibilty_autoclick_preference_subtitle_long_delay }; /** @@ -86,7 +84,7 @@ public class ToggleAutoclickPreferenceFragment extends DashboardFragment // Only show integer when delay time is 1. final String decimalFormat = (delaySecond == 1) ? "%.0f" : "%.1f"; - return resources.getQuantityString(mAutoclickPreferenceSummaries[summaryIndex], + return resources.getQuantityString(AUTOCLICK_PREFERENCE_SUMMARIES[summaryIndex], quantity, String.format(decimalFormat, delaySecond)); } @@ -98,10 +96,10 @@ public class ToggleAutoclickPreferenceFragment extends DashboardFragment return 0; } if (delay >= MAX_AUTOCLICK_DELAY_MS) { - return mAutoclickPreferenceSummaries.length - 1; + return AUTOCLICK_PREFERENCE_SUMMARIES.length - 1; } int delayRange = MAX_AUTOCLICK_DELAY_MS - MIN_AUTOCLICK_DELAY_MS; - int rangeSize = (delayRange) / (mAutoclickPreferenceSummaries.length - 1); + int rangeSize = (delayRange) / (AUTOCLICK_PREFERENCE_SUMMARIES.length - 1); return (delay - MIN_AUTOCLICK_DELAY_MS) / rangeSize; }