Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 24398 into eclair

Browse Source 
* changes:
  Adjust the WebTextView's text size according to density.
This commit is contained in:
Android (Google) Code Review
2009-09-09 16:22:16 -04:00
parent d380586ac1 3a6c88c289
commit f416264a3b
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/webkit/WebView.java
View File

@@ -46,6 +46,7 @@ import android.text.Spannable;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.EventLog; import android.util.EventLog;
import android.util.Log; import android.util.Log;
import android.util.TypedValue;
import android.view.Gravity; import android.view.Gravity;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -2768,7 +2769,8 @@ public class WebView extends AbsoluteLayout
mZoomScale = 0; mZoomScale = 0;
if (mNeedToAdjustWebTextView) { if (mNeedToAdjustWebTextView) {
mNeedToAdjustWebTextView = false; mNeedToAdjustWebTextView = false;
mWebTextView.setTextSize(contentToViewDimension( mWebTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
contentToViewDimension(
nativeFocusCandidateTextSize())); nativeFocusCandidateTextSize()));
Rect bounds = nativeFocusCandidateNodeBounds(); Rect bounds = nativeFocusCandidateNodeBounds();
Rect vBox = contentToView(bounds); Rect vBox = contentToView(bounds);
@@ -3333,7 +3335,8 @@ public class WebView extends AbsoluteLayout
// Initialize our generation number. // Initialize our generation number.
mTextGeneration = 0; mTextGeneration = 0;
} }
mWebTextView.setTextSize(contentToViewDimension(nativeFocusCandidateTextSize())); mWebTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
contentToViewDimension(nativeFocusCandidateTextSize()));
Rect visibleRect = new Rect(); Rect visibleRect = new Rect();
calcOurContentVisibleRect(visibleRect); calcOurContentVisibleRect(visibleRect);
// Note that sendOurVisibleRect calls viewToContent, so the coordinates // Note that sendOurVisibleRect calls viewToContent, so the coordinates