diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-01-26 19:04:15 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-26 19:04:15 -0800 |
| commit | 2dc9c784b2fab67a8233318f559e65f444bf0c97 (patch) | |
| tree | 4463638fdc2b29e05817ff72079545b6db972012 /core | |
| parent | ede54ce2fe3252d4ab56b90de464b35a6920970d (diff) | |
| parent | 63042d6a0347017fcc4cd98560ca3407044c165c (diff) | |
| download | frameworks_base-2dc9c784b2fab67a8233318f559e65f444bf0c97.zip frameworks_base-2dc9c784b2fab67a8233318f559e65f444bf0c97.tar.gz frameworks_base-2dc9c784b2fab67a8233318f559e65f444bf0c97.tar.bz2 | |
Merge "Fix issue #3382992: IME close animation stutters from URL bar" into honeycomb
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/View.java | 10 | ||||
| -rw-r--r-- | core/java/android/view/ViewRoot.java | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 4c40653..2e6664b 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -11398,6 +11398,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility } } + /** @hide */ + public void hackTurnOffWindowResizeAnim(boolean off) { + mAttachInfo.mTurnOffWindowResizeAnim = off; + } + /** * Interface definition for a callback to be invoked when a key event is * dispatched to this view. The callback will be invoked before the key @@ -11664,6 +11669,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility boolean mScalingRequired; /** + * If set, ViewRoot doesn't use its lame animation for when the window resizes. + */ + boolean mTurnOffWindowResizeAnim; + + /** * Left position of this view's window */ int mWindowLeft; diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java index 042095a..41fc6c6 100644 --- a/core/java/android/view/ViewRoot.java +++ b/core/java/android/view/ViewRoot.java @@ -772,6 +772,7 @@ public final class ViewRoot extends Handler implements ViewParent, if (!mAttachInfo.mContentInsets.equals(mPendingContentInsets)) { if (mWidth > 0 && mHeight > 0 && mSurface != null && mSurface.isValid() && + !mAttachInfo.mTurnOffWindowResizeAnim && mAttachInfo.mHardwareRenderer != null && mAttachInfo.mHardwareRenderer.isEnabled() && lp != null && !PixelFormat.formatHasAlpha(lp.format)) { |