Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a6c88c2 authored by Leon Scroggins's avatar Leon Scroggins
Browse files

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
parent 41140098

core/java/android/webkit/WebView.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -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