From 3a6c88c28905590477bd5cf8b6d23cdb517de159 Mon Sep 17 00:00:00 2001 From: Leon Scroggins Date: Wed, 9 Sep 2009 14:50:23 -0400 Subject: [PATCH] Adjust the WebTextView's text size according to density. Fix for http://b/issue?id=2063143 . Use TypedValue's types to set the text size properly for the screen's density. Change-Id: I3772035157e2a9a8a2dba00ebddbf967c42bfa99 --- core/java/android/webkit/WebView.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 8a986fa865e46..018fc64cd626f 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -46,6 +46,7 @@ import android.text.Spannable; import android.util.AttributeSet; import android.util.EventLog; import android.util.Log; +import android.util.TypedValue; import android.view.Gravity; import android.view.KeyEvent; import android.view.LayoutInflater; @@ -2768,7 +2769,8 @@ public class WebView extends AbsoluteLayout mZoomScale = 0; if (mNeedToAdjustWebTextView) { mNeedToAdjustWebTextView = false; - mWebTextView.setTextSize(contentToViewDimension( + mWebTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX, + contentToViewDimension( nativeFocusCandidateTextSize())); Rect bounds = nativeFocusCandidateNodeBounds(); Rect vBox = contentToView(bounds); @@ -3333,7 +3335,8 @@ public class WebView extends AbsoluteLayout // Initialize our generation number. mTextGeneration = 0; } - mWebTextView.setTextSize(contentToViewDimension(nativeFocusCandidateTextSize())); + mWebTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX, + contentToViewDimension(nativeFocusCandidateTextSize())); Rect visibleRect = new Rect(); calcOurContentVisibleRect(visibleRect); // Note that sendOurVisibleRect calls viewToContent, so the coordinates