commit 5015e0f13bd54fc93f5aad5203a602c0a0674ca6
author Baligh Uddin <baligh@google.com> Tue Feb 18 04:40:49 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 18 04:40:49 2014 +0000
tree 2bcb838d86aaccddd5bd45d43fb7b276ba0bbf94
parent bc02ced9fb1f65cfd80961c11d8cbe999e57b793
parent 9342f0a7c64dc792da2433b1384ba3dc1b99a7b0

Merge "Import translations. DO NOT MERGE"

src/com/android/settings/accessibility/EdgeTypePreference.java

diff --git a/src/com/android/settings/accessibility/EdgeTypePreference.java b/src/com/android/settings/accessibility/EdgeTypePreference.java
index ad71a76..3bff704 100644
--- a/src/com/android/settings/accessibility/EdgeTypePreference.java
+++ b/src/com/android/settings/accessibility/EdgeTypePreference.java
@@ -34,7 +34,7 @@
     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 @@
 
         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);

src/com/android/settings/accessibility/PresetPreference.java

diff --git a/src/com/android/settings/accessibility/PresetPreference.java b/src/com/android/settings/accessibility/PresetPreference.java
index 84aba6c..9f1aee3 100644
--- a/src/com/android/settings/accessibility/PresetPreference.java
+++ b/src/com/android/settings/accessibility/PresetPreference.java
@@ -27,7 +27,7 @@
 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 @@
         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) {