summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adrian Roos <roosa@google.com> 2015-02-17 18:46:40 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-02-17 18:46:40 +0000
commit7131a7d64eab99bacf3e3caaa6494d31812b4162 (patch)
tree705fedddd97320b63b5ed9ff05269735010e515a
parent0a786f5f227683f2d54145117b746629ddd2c32b (diff)
parentd245ad24f5e6e8c7b302689467b12718c94f4ced (diff)
am d245ad24: am 024fd0c6: Disable color view animations when stable insets change
* commit 'd245ad24f5e6e8c7b302689467b12718c94f4ced': Disable color view animations when stable insets change
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindow.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index f5d43d84f609..b4811da1fd76 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -2867,11 +2867,11 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
// indicates that the window was either just added and received them for the
// first time, or the window size or position has changed.
boolean hasTopStableInset = insets.getStableInsetTop() != 0;
- disallowAnimate |= hasTopStableInset && !mLastHasTopStableInset;
+ disallowAnimate |= (hasTopStableInset != mLastHasTopStableInset);
mLastHasTopStableInset = hasTopStableInset;
boolean hasBottomStableInset = insets.getStableInsetBottom() != 0;
- disallowAnimate |= hasBottomStableInset && !mLastHasBottomStableInset;
+ disallowAnimate |= (hasBottomStableInset != mLastHasBottomStableInset);
mLastHasBottomStableInset = hasBottomStableInset;
}