From 94c715d662e803b43dde8984a60f937a26706c7d Mon Sep 17 00:00:00 2001
From: Grace Kloba <klobag@google.com>
Date: Mon, 28 Sep 2009 23:23:53 -0700
Subject: Skip requestRectangleOnScreen for WebTextView during zoom animation.
 If it is in edit mode, we already adjust WebTextView in the end of zoom
 animation.

Fix part 1 of http://b/issue?id=2147168
---
 core/java/android/webkit/WebTextView.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'core/java/android/webkit/WebTextView.java')

diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java
index d24a5ab..65ce158 100644
--- a/core/java/android/webkit/WebTextView.java
+++ b/core/java/android/webkit/WebTextView.java
@@ -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;
+    }
 }
-- 
cgit v1.1