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 
am: 9fbd981f23

Change-Id: I36aa427a3023dcba2a29eccfc0b7aac43748e534
This commit is contained in:
Michael Kwan
2017-02-14 00:55:32 +00:00
committed by android-build-merger
parent aeb1f1241e 9fbd981f23
commit a26e371c9b
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
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);
}
}
});
}