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

Merge "Use custom default font_scale behing flag" into main

Browse Source
This commit is contained in:
Massimo Carli
2024-01-25 18:06:13 +00:00
committed by Android (Google) Code Review
parent 6e3428c75f 3770452077
commit 4db2698714
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/accessibility/FontSizeData.java
View File

@@ -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<Float> {
FontSizeData(Context context) {
super(context);
final Resources resources = getContext().getResources();
final ContentResolver resolver = getContext().getContentResolver();
final List<String> 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<Float> {
}
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;
}
}