From bc02ced9fb1f65cfd80961c11d8cbe999e57b793 Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Mon, 17 Feb 2014 13:34:37 -0800 Subject: [PATCH] Set caption preview font size in dips Change-Id: I9844b6f927b557b46f23c6211b5be47647002ab8 --- .../android/settings/accessibility/EdgeTypePreference.java | 6 ++++-- .../android/settings/accessibility/PresetPreference.java | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/accessibility/EdgeTypePreference.java b/src/com/android/settings/accessibility/EdgeTypePreference.java index ad71a765c7c..3bff704f3f6 100644 --- a/src/com/android/settings/accessibility/EdgeTypePreference.java +++ b/src/com/android/settings/accessibility/EdgeTypePreference.java @@ -34,7 +34,7 @@ public class EdgeTypePreference extends ListDialogPreference { private static final int DEFAULT_FOREGROUND_COLOR = Color.WHITE; private static final int DEFAULT_BACKGROUND_COLOR = Color.TRANSPARENT; private static final int DEFAULT_EDGE_COLOR = Color.BLACK; - private static final float DEFAULT_FONT_SIZE = 96f; + private static final float DEFAULT_FONT_SIZE = 32f; public EdgeTypePreference(Context context, AttributeSet attrs) { super(context, attrs); @@ -57,7 +57,9 @@ public class EdgeTypePreference extends ListDialogPreference { preview.setForegroundColor(DEFAULT_FOREGROUND_COLOR); preview.setBackgroundColor(DEFAULT_BACKGROUND_COLOR); - preview.setTextSize(DEFAULT_FONT_SIZE); + + final float density = getContext().getResources().getDisplayMetrics().density; + preview.setTextSize(DEFAULT_FONT_SIZE * density); final int value = getValueAt(index); preview.setEdgeType(value); diff --git a/src/com/android/settings/accessibility/PresetPreference.java b/src/com/android/settings/accessibility/PresetPreference.java index 84aba6c7e11..9f1aee37cde 100644 --- a/src/com/android/settings/accessibility/PresetPreference.java +++ b/src/com/android/settings/accessibility/PresetPreference.java @@ -27,7 +27,7 @@ import com.android.internal.widget.SubtitleView; import com.android.settings.R; public class PresetPreference extends ListDialogPreference { - private static final float DEFAULT_FONT_SIZE = 96f; + private static final float DEFAULT_FONT_SIZE = 32f; private final CaptioningManager mCaptioningManager; @@ -54,7 +54,8 @@ public class PresetPreference extends ListDialogPreference { CaptionPropertiesFragment.applyCaptionProperties( mCaptioningManager, previewText, value); - previewText.setTextSize(DEFAULT_FONT_SIZE); + final float density = getContext().getResources().getDisplayMetrics().density; + previewText.setTextSize(DEFAULT_FONT_SIZE * density); final CharSequence title = getTitleAt(index); if (title != null) {