summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2015-02-17 16:37:53 +0100
committerAlan Newberger <alann@google.com>2015-02-17 10:24:52 -0800
commit024fd0c6051e01579018fad0c1a56e9e47b195df (patch)
tree595fbd030e57993b00b828b8086169c53dc16da7 /policy
parent27ad2e95b40fd0ca76de384695498ea114d627ca (diff)
downloadframeworks_base-024fd0c6051e01579018fad0c1a56e9e47b195df.zip
frameworks_base-024fd0c6051e01579018fad0c1a56e9e47b195df.tar.gz
frameworks_base-024fd0c6051e01579018fad0c1a56e9e47b195df.tar.bz2
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
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;
}