summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit/WebTextView.java
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2009-09-28 23:23:53 -0700
committerGrace Kloba <klobag@google.com>2009-09-28 23:23:53 -0700
commit94c715d662e803b43dde8984a60f937a26706c7d (patch)
tree382be84a8711dfdc29b99b05b0ee260d0054f267 /core/java/android/webkit/WebTextView.java
parentff966d5f6c88a9fba033f1bb5ec087464376534d (diff)
downloadframeworks_base-94c715d662e803b43dde8984a60f937a26706c7d.zip
frameworks_base-94c715d662e803b43dde8984a60f937a26706c7d.tar.gz
frameworks_base-94c715d662e803b43dde8984a60f937a26706c7d.tar.bz2
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
Diffstat (limited to 'core/java/android/webkit/WebTextView.java')
-rw-r--r--core/java/android/webkit/WebTextView.java10
1 files changed, 10 insertions, 0 deletions
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;
+ }
}