diff options
| author | Adrian Roos <roosa@google.com> | 2015-02-17 18:53:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-17 18:53:13 +0000 |
| commit | 018a3b6d5b23f9c963d6e4a45ec4cb29abbb9155 (patch) | |
| tree | d57413a475600a540707117fd54ae339b390c8bb /policy/src | |
| parent | b1ea8a5316f9e439fd7608e1152c45aaf8f098ff (diff) | |
| parent | 7131a7d64eab99bacf3e3caaa6494d31812b4162 (diff) | |
| download | frameworks_base-018a3b6d5b23f9c963d6e4a45ec4cb29abbb9155.zip frameworks_base-018a3b6d5b23f9c963d6e4a45ec4cb29abbb9155.tar.gz frameworks_base-018a3b6d5b23f9c963d6e4a45ec4cb29abbb9155.tar.bz2 | |
am 7131a7d6: am d245ad24: am 024fd0c6: Disable color view animations when stable insets change
* commit '7131a7d64eab99bacf3e3caaa6494d31812b4162':
Disable color view animations when stable insets change
Diffstat (limited to 'policy/src')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 4 |
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; } |