Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only modify window layout params when necessary." into cw-f-dev

Browse Source
This commit is contained in:
Michael Kwan
2017-02-14 00:48:10 +00:00
committed by Android (Google) Code Review
parent 7bae18232e 134ad6ef3f
commit 9fbd981f23
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/com/android/internal/policy/PhoneWindow.java
View File

@@ -3016,10 +3016,14 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
@Override @Override
public void onSwipeCancelled(SwipeDismissLayout layout) { public void onSwipeCancelled(SwipeDismissLayout layout) {
WindowManager.LayoutParams newParams = getAttributes(); WindowManager.LayoutParams newParams = getAttributes();
newParams.x = 0; // Swipe changes only affect the x-translation and alpha, check to see if
newParams.alpha = 1; // those values have changed first before resetting them.
setAttributes(newParams); if (newParams.x != 0 || newParams.alpha != 1) {
setFlags(FLAG_FULLSCREEN, FLAG_FULLSCREEN | FLAG_LAYOUT_NO_LIMITS); newParams.x = 0;
newParams.alpha = 1;
setAttributes(newParams);
setFlags(FLAG_FULLSCREEN, FLAG_FULLSCREEN | FLAG_LAYOUT_NO_LIMITS);
}
} }
}); });
} }