diff options
author | Michael Kwan <mkwan@google.com> | 2017-02-14 00:48:10 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-02-14 00:48:12 +0000 |
commit | 9fbd981f2309c3ad6e3897b1dada03b10a1bd034 (patch) | |
tree | c7671370f6c1311f3ed6e700eca96fa15d11c8fe | |
parent | 7bae18232e754542f28ed45215035d5b56fc5a76 (diff) | |
parent | 134ad6ef3f9cb62f8c98f2f494836d73e4a9f700 (diff) | |
download | base-9fbd981f2309c3ad6e3897b1dada03b10a1bd034.tar.gz |
Merge "Only modify window layout params when necessary." into cw-f-dev
-rw-r--r-- | core/java/com/android/internal/policy/PhoneWindow.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java index 920a6cb0f84c..3b280ad20d41 100644 --- a/core/java/com/android/internal/policy/PhoneWindow.java +++ b/core/java/com/android/internal/policy/PhoneWindow.java @@ -3016,10 +3016,14 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { @Override public void onSwipeCancelled(SwipeDismissLayout layout) { WindowManager.LayoutParams newParams = getAttributes(); - newParams.x = 0; - newParams.alpha = 1; - setAttributes(newParams); - setFlags(FLAG_FULLSCREEN, FLAG_FULLSCREEN | FLAG_LAYOUT_NO_LIMITS); + // Swipe changes only affect the x-translation and alpha, check to see if + // those values have changed first before resetting them. + if (newParams.x != 0 || newParams.alpha != 1) { + newParams.x = 0; + newParams.alpha = 1; + setAttributes(newParams); + setFlags(FLAG_FULLSCREEN, FLAG_FULLSCREEN | FLAG_LAYOUT_NO_LIMITS); + } } }); } |