summaryrefslogtreecommitdiff
path: root/core/java/android/view/ViewRoot.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-01-26 19:04:15 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-26 19:04:15 -0800
commit2dc9c784b2fab67a8233318f559e65f444bf0c97 (patch)
tree4463638fdc2b29e05817ff72079545b6db972012 /core/java/android/view/ViewRoot.java
parentede54ce2fe3252d4ab56b90de464b35a6920970d (diff)
parent63042d6a0347017fcc4cd98560ca3407044c165c (diff)
Merge "Fix issue #3382992: IME close animation stutters from URL bar" into honeycomb
Diffstat (limited to 'core/java/android/view/ViewRoot.java')
-rw-r--r--core/java/android/view/ViewRoot.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java
index 042095a14d69..41fc6c6e33d0 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)) {