From 37704520779ef7b8df2cc82d0ac0ec0aa7d197a7 Mon Sep 17 00:00:00 2001 From: Massimo Carli Date: Thu, 18 Jan 2024 23:55:17 +0000 Subject: [PATCH] Use custom default font_scale behing flag When the flag is enabled, we read the default font scale value from the device_font_scale property in Settings. Flag: ACONFIG com.android.window.flags.configurable_font_scale_default DEVELOPMENT Bug: 316160749 Test: atest SettingsRoboTests:FontSizeDataTest Change-Id: I03a5ee9a2bd364dca9c75b131832e5f9e868167a --- .../android/settings/accessibility/FontSizeData.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/accessibility/FontSizeData.java b/src/com/android/settings/accessibility/FontSizeData.java index 1226d25b0e3..096710d89f3 100644 --- a/src/com/android/settings/accessibility/FontSizeData.java +++ b/src/com/android/settings/accessibility/FontSizeData.java @@ -25,6 +25,7 @@ import android.content.res.Resources; import android.provider.Settings; import com.android.settingslib.R; +import com.android.window.flags.Flags; import java.util.Arrays; import java.util.List; @@ -38,12 +39,11 @@ final class FontSizeData extends PreviewSizeData { FontSizeData(Context context) { super(context); - final Resources resources = getContext().getResources(); final ContentResolver resolver = getContext().getContentResolver(); final List strEntryValues = Arrays.asList(resources.getStringArray(R.array.entryvalues_font_size)); - setDefaultValue(FONT_SCALE_DEF_VALUE); + setDefaultValue(getFontScaleDefValue(resolver)); final float currentScale = Settings.System.getFloat(resolver, Settings.System.FONT_SCALE, getDefaultValue()); setInitialIndex(fontSizeValueToIndex(currentScale, strEntryValues.toArray(new String[0]))); @@ -78,4 +78,10 @@ final class FontSizeData extends PreviewSizeData { } return indices.length - 1; } + + private float getFontScaleDefValue(ContentResolver resolver) { + return Flags.configurableFontScaleDefault() ? Settings.System.getFloat(resolver, + Settings.System.DEFAULT_DEVICE_FONT_SCALE, FONT_SCALE_DEF_VALUE) + : FONT_SCALE_DEF_VALUE; + } }