Merge "Fix formats and internationalization of the string "0.6 seconds" in sk... (24f71c6e) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -5188,7 +5188,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] -->

+1 −1

Original line number	Diff line number	Diff line
		@@ -205,7 +205,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";

+4 −2

Original line number	Diff line number	Diff line
		@@ -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";