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

Commit ef632f04 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Attempt to fix infinite recursion."

parents ef14da32 dbbf45e7

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

+2 −0
Original line number Diff line number Diff line
@@ -302,6 +302,8 @@ public class NotificationPanelView extends PanelView implements 
        mUnlockIconActive = false;

        mPageSwiper.reset();

        closeQs();

        mNotificationStackScroller.setOverScrollAmount(0f, true /* onTop */, false /* animate */,

                true /* cancelAnimators */);

    }



    public void closeQs() {

packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java

+1 −1
Original line number Diff line number Diff line
@@ -188,10 +188,10 @@ public class PanelBar extends FrameLayout { 
                pv.collapse();

                waiting = true;

            } else {

                pv.resetViews();

                pv.setExpandedFraction(0); // just in case

                pv.setVisibility(View.GONE);

                pv.cancelPeek();

                pv.resetViews();

            }

        }

        if (DEBUG) LOG("collapseAllPanels: animate=%s waiting=%s", animate, waiting);