Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fbd981f authored by Michael Kwan's avatar Michael Kwan Committed by Android (Google) Code Review
Browse files

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

parents 7bae1823 134ad6ef

core/java/com/android/internal/policy/PhoneWindow.java

+8 −4
Original line number Original line Diff line number Diff line
@@ -3016,11 +3016,15 @@ 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();

                        // 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.x = 0;

                            newParams.alpha = 1;

                            newParams.alpha = 1;

                            setAttributes(newParams);

                            setAttributes(newParams);

                            setFlags(FLAG_FULLSCREEN, FLAG_FULLSCREEN | FLAG_LAYOUT_NO_LIMITS);

                            setFlags(FLAG_FULLSCREEN, FLAG_FULLSCREEN | FLAG_LAYOUT_NO_LIMITS);

                        }

                        }

                    }

                });

                });

    }

    }