diff options
author | Grace Kloba <klobag@google.com> | 2009-09-28 23:23:53 -0700 |
---|---|---|
committer | Grace Kloba <klobag@google.com> | 2009-09-28 23:23:53 -0700 |
commit | 94c715d662e803b43dde8984a60f937a26706c7d (patch) | |
tree | 382be84a8711dfdc29b99b05b0ee260d0054f267 /core/java | |
parent | ff966d5f6c88a9fba033f1bb5ec087464376534d (diff) | |
download | frameworks_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')
-rw-r--r-- | core/java/android/webkit/WebTextView.java | 10 | ||||
-rw-r--r-- | core/java/android/webkit/WebView.java | 4 |
2 files changed, 14 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; + } } diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 603f67a..8858b81 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -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 |