Disable color view animations when stable insets change

Prevents color view from showing up on phones when
the orientation changes to landscape. Previously, the
animation was only prevented when the stable inset of a
bar became nonzero; now we disable animations whenever
the nonzeroness changes.

Bug: 19353466
Change-Id: I31b4103fe984d158a98cd446ac2ddbe15a408e49

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 (file)
--- 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;
                 }