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

Pass the actual quantity/count to the MessageFormat and let it decide

Browse Source 
Bug: 185400417
Test: manual (the autoclick location has changed to Settings > System >
Trackpad & mouse > Pointer & touch accessibility > Autoclick)
Flag: EXEMPT low risk localization fix

Change-Id: Iee63b87513550a6758db9dce376e88a12a51d9f8
This commit is contained in:
Chun-Ku Lin
2024-10-10 00:56:43 +00:00
parent cb6b37e6d6
commit 0a6d37b871
1 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/accessibility/AutoclickUtils.java
View File

@@ -16,18 +16,11 @@
package com.android.settings.accessibility; package com.android.settings.accessibility;
import static java.lang.annotation.RetentionPolicy.SOURCE;
import android.annotation.IntDef;
import android.annotation.PluralsRes;
import android.annotation.StringRes; import android.annotation.StringRes;
import android.content.Context; import android.content.Context;
import android.content.res.Resources;
import com.android.settings.R;
import com.android.settingslib.utils.StringUtil; import com.android.settingslib.utils.StringUtil;
import java.lang.annotation.Retention;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@@ -52,16 +45,6 @@ public final class AutoclickUtils {
*/ */
static final int AUTOCLICK_DELAY_STEP = 100; static final int AUTOCLICK_DELAY_STEP = 100;
@Retention(SOURCE)
@IntDef({
Quantity.ONE,
Quantity.FEW
})
private @interface Quantity {
int ONE = 1;
int FEW = 3;
}
/** /**
* Gets string that should be used for provided autoclick delay. * Gets string that should be used for provided autoclick delay.
* *
@@ -73,13 +56,12 @@ public final class AutoclickUtils {
*/ */
public static CharSequence getAutoclickDelaySummary(Context context, public static CharSequence getAutoclickDelaySummary(Context context,
@StringRes int id, int delayMillis) { @StringRes int id, int delayMillis) {
final int quantity = (delayMillis == 1000) ? Quantity.ONE : Quantity.FEW;
final float delaySecond = (float) delayMillis / 1000; final float delaySecond = (float) delayMillis / 1000;
// Only show integer when delay time is 1. // Only show integer when delay time is 1.
final String decimalFormat = (delaySecond == 1) ? "%.0f" : "%.1f"; final String decimalFormat = (delaySecond == 1) ? "%.0f" : "%.1f";
Map<String, Object> arguments = new HashMap<>(); Map<String, Object> arguments = new HashMap<>();
arguments.put("count", quantity); arguments.put("count", delaySecond);
arguments.put("time", String.format(decimalFormat, delaySecond)); arguments.put("time", String.format(decimalFormat, delaySecond));
return StringUtil.getIcuPluralsString(context, arguments, id); return StringUtil.getIcuPluralsString(context, arguments, id);
} }