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

Merge "Fix b/266795925: Different font size in IW language."

Browse Source
This commit is contained in:
TreeHugger Robot
2023-01-31 11:41:16 +00:00
committed by Android (Google) Code Review
parent 10ed79ba5c 4af2ef80b0
commit 2646bc2f07
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/fuelgauge/batteryusage/ScreenOnTimeController.java
View File

@@ -30,6 +30,7 @@ import com.android.settings.R;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.utils.StringUtil; import com.android.settingslib.utils.StringUtil;
import java.util.Locale;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@@ -39,6 +40,7 @@ public class ScreenOnTimeController extends BasePreferenceController {
private static final String ROOT_PREFERENCE_KEY = "screen_on_time_category"; private static final String ROOT_PREFERENCE_KEY = "screen_on_time_category";
private static final String SCREEN_ON_TIME_TEXT_PREFERENCE_KEY = "screen_on_time_text"; private static final String SCREEN_ON_TIME_TEXT_PREFERENCE_KEY = "screen_on_time_text";
private static final Pattern NUMBER_PATTERN = Pattern.compile("[\\d]*[\\.,]?[\\d]+"); private static final Pattern NUMBER_PATTERN = Pattern.compile("[\\d]*[\\.,]?[\\d]+");
private static final Locale IW_LOCALE = new Locale("iw");
@VisibleForTesting @VisibleForTesting
Context mPrefContext; Context mPrefContext;
@@ -89,16 +91,22 @@ public class ScreenOnTimeController extends BasePreferenceController {
final CharSequence timeSequence = final CharSequence timeSequence =
StringUtil.formatElapsedTime(mPrefContext, (double) screenOnTime, StringUtil.formatElapsedTime(mPrefContext, (double) screenOnTime,
/*withSeconds=*/ false, /*collapseTimeUnit=*/ false); /*withSeconds=*/ false, /*collapseTimeUnit=*/ false);
mScreenOnTimeTextPreference.setText(enlargeFontOfNumber(removeCommas(timeSequence))); mScreenOnTimeTextPreference.setText(
enlargeFontOfNumberIfNeeded(mPrefContext, removeCommas(timeSequence)));
mScreenOnTimeTextPreference.setVisible(true); mScreenOnTimeTextPreference.setVisible(true);
} }
@VisibleForTesting @VisibleForTesting
static CharSequence enlargeFontOfNumber(CharSequence text) { static CharSequence enlargeFontOfNumberIfNeeded(Context context, CharSequence text) {
if (TextUtils.isEmpty(text)) { if (TextUtils.isEmpty(text)) {
return ""; return "";
} }
final Locale locale = context.getResources().getConfiguration().getLocales().get(0);
if (locale != null && IW_LOCALE.getLanguage().equals(locale.getLanguage())) {
return text;
}
final SpannableString spannableText = new SpannableString(text); final SpannableString spannableText = new SpannableString(text);
final Matcher matcher = NUMBER_PATTERN.matcher(text); final Matcher matcher = NUMBER_PATTERN.matcher(text);
while (matcher.find()) { while (matcher.find()) {