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

Commit 7745e035 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I94c715d6 into eclair 

* changes:
  Skip requestRectangleOnScreen for WebTextView during zoom animation. If it is in edit mode, we already adjust WebTextView in the end of zoom animation.
parents 7db7e6a0 94c715d6

core/java/android/webkit/WebTextView.java

+10 −0
Original line number Diff line number Diff line
@@ -813,4 +813,14 @@ import java.util.ArrayList; 
    /* package */ void updateCachedTextfield() {

        mWebView.updateCachedTextfield(getText().toString());

    }



    @Override

    public boolean requestRectangleOnScreen(Rect rectangle) {

        // don't scroll while in zoom animation. When it is done, we will adjust

        // the WebTextView if it is in editing mode.

        if (!mWebView.inAnimateZoom()) {

            return super.requestRectangleOnScreen(rectangle);

        }

        return false;

    }

}

core/java/android/webkit/WebView.java

+4 −0
Original line number Diff line number Diff line
@@ -2814,6 +2814,10 @@ public class WebView extends AbsoluteLayout 
        }

    }



    boolean inAnimateZoom() {

        return mZoomScale != 0;

    }



    /**

     * Need to adjust the WebTextView after a change in zoom, since mActualScale

     * has changed.  This is especially important for password fields, which are