From 8a2760360042cb32204fc0cddb27bae5fc9be440 Mon Sep 17 00:00:00 2001
From: menghanli <menghanli@google.com>
Date: Thu, 23 Apr 2020 11:02:12 +0800
Subject: [PATCH] Fix formats and internationalization of the string "0.6
 seconds" in sk language
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Root cause: The OTHER quantity does not require special treatment of the given quantity
Next: Using few quantity for the language requires special treatment of "small" numbers (as with  numbers ending 2, 3, or 4)

Bug: 154085511
Test: Change language to Slovensko to check the UI
Change-Id: I9143d9504cf8f9c5ccf17160e0dc0943fa10d31d
---
 res/values/strings.xml                                      | 3 ++-
 .../ToggleAutoclickCustomSeekbarController.java             | 2 +-
 .../accessibility/ToggleAutoclickPreferenceFragment.java    | 6 ++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5ab9c33915b..36e83bffc92 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5186,7 +5186,8 @@
     <!-- Summary for autoclick seekbar settings preference when user selected custom item. [CHAR LIMIT=35] -->
     <plurals name="accessibilty_autoclick_delay_unit_second">
         <item quantity="one"><xliff:g id="click_delay_label" example="1">%1$s</xliff:g> second</item>
-        <item quantity="other"><xliff:g id="click_delay_label" example="0.6">%1$s</xliff:g> seconds</item>
+        <item quantity="few"><xliff:g id="click_delay_label" example="0.6">%1$s</xliff:g> seconds</item>
+        <item quantity="other"><xliff:g id="click_delay_label">%1$s</xliff:g> seconds</item>
     </plurals>
 
     <!-- Summary for vibration settings preference when notification vibration and haptic feedback intensity are set. [CHAR LIMIT=50] -->
diff --git a/src/com/android/settings/accessibility/ToggleAutoclickCustomSeekbarController.java b/src/com/android/settings/accessibility/ToggleAutoclickCustomSeekbarController.java
index b98a503fe8b..0079d91c96a 100644
--- a/src/com/android/settings/accessibility/ToggleAutoclickCustomSeekbarController.java
+++ b/src/com/android/settings/accessibility/ToggleAutoclickCustomSeekbarController.java
@@ -204,7 +204,7 @@ public class ToggleAutoclickCustomSeekbarController extends BasePreferenceContro
     }
 
     private CharSequence delayTimeToString(int delayMillis) {
-        final int quantity = (delayMillis == 1000) ? Quantity.ONE : Quantity.OTHER;
+        final int quantity = (delayMillis == 1000) ? Quantity.ONE : Quantity.FEW;
         final float delaySecond = (float) delayMillis / 1000;
         // Only show integer when delay time is 1.
         final String decimalFormat = (delaySecond == 1) ? "%.0f" : "%.1f";
diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
index 11fe80e5355..03d4a4cad10 100644
--- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
@@ -53,11 +53,13 @@ public class ToggleAutoclickPreferenceFragment extends DashboardFragment
     @Retention(SOURCE)
     @IntDef({
             Quantity.OTHER,
-            Quantity.ONE
+            Quantity.ONE,
+            Quantity.FEW
     })
     @interface Quantity {
         int OTHER = 0;
         int ONE = 1;
+        int FEW = 3;
     }
 
     /**
@@ -79,7 +81,7 @@ public class ToggleAutoclickPreferenceFragment extends DashboardFragment
      */
     static CharSequence getAutoclickPreferenceSummary(Resources resources, int delayMillis) {
         final int summaryIndex = getAutoclickPreferenceSummaryIndex(delayMillis);
-        final int quantity = (delayMillis == 1000) ? Quantity.ONE : Quantity.OTHER;
+        final int quantity = (delayMillis == 1000) ? Quantity.ONE : Quantity.FEW;
         final float delaySecond =  (float) delayMillis / 1000;
         // Only show integer when delay time is 1.
         final String decimalFormat = (delaySecond == 1) ? "%.0f" : "%.1f";