am 7131a7d6: am d245ad24: am 024fd0c6: Disable color view animations when stable insets change

* commit '7131a7d64eab99bacf3e3caaa6494d31812b4162':
  Disable color view animations when stable insets change
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 @@
                     // 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;
                 }