summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2015-02-17 18:40:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-17 18:40:01 +0000
commitd245ad24f5e6e8c7b302689467b12718c94f4ced (patch)
tree5d855617ed3b6151e05cd917b2fccca5e46fff46 /policy
parentf27b98508492ebad1e183cb052df0327d47693b4 (diff)
parent024fd0c6051e01579018fad0c1a56e9e47b195df (diff)
downloadframeworks_base-d245ad24f5e6e8c7b302689467b12718c94f4ced.zip
frameworks_base-d245ad24f5e6e8c7b302689467b12718c94f4ced.tar.gz
frameworks_base-d245ad24f5e6e8c7b302689467b12718c94f4ced.tar.bz2
am 024fd0c6: Disable color view animations when stable insets change
* commit '024fd0c6051e01579018fad0c1a56e9e47b195df': Disable color view animations when stable insets change
Diffstat (limited to 'policy')
-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 f5d43d8..b4811da 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;
}