summaryrefslogtreecommitdiff
path: root/core/java/android/view/ViewRoot.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-01-26 19:17:46 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-26 19:17:46 -0800
commit166f26e2c2378decaf023a4c829b03034a65d160 (patch)
tree7eebf0cdaa4f7d465c7d4d02775deba5295c66be /core/java/android/view/ViewRoot.java
parent66f3ca1c0570271e6c4893497eafd9b15f3745f4 (diff)
parentf35d43f90b9e4553343a59b217430aaba91b0d1f (diff)
am f35d43f9: am 2dc9c784: Merge "Fix issue #3382992: IME close animation stutters from URL bar" into honeycomb
* commit 'f35d43f90b9e4553343a59b217430aaba91b0d1f': Fix issue #3382992: IME close animation stutters from URL bar
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 4076f8995b8a..a8772fe41cfb 100644
--- a/core/java/android/view/ViewRoot.java
+++ b/core/java/android/view/ViewRoot.java
@@ -777,6 +777,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)) {