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

Commit 5bf61884 authored by Riddle Hsu's avatar Riddle Hsu Committed by android-build-merger
Browse files

Merge "Fix focusable on entire notification area if QS is expanded" into pi-dev am: eacc2163 

am: fb9bfe3f

Change-Id: Ie2fa660ad8b350c5a46dc40d66e5ffbfe8e3d2bf
parents f6f77c56 fb9bfe3f

packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java

+2 −1
Original line number Diff line number Diff line
@@ -2222,7 +2222,7 @@ public class NotificationStackScrollLayout extends ViewGroup 
    }



    private void updateScrollability() {

        boolean scrollable = getScrollRange() > 0;

        boolean scrollable = !mQsExpanded && getScrollRange() > 0;

        if (scrollable != mScrollable) {

            mScrollable = scrollable;

            setFocusable(scrollable);
@@ -4500,6 +4500,7 @@ public class NotificationStackScrollLayout extends ViewGroup 
    public void setQsExpanded(boolean qsExpanded) {

        mQsExpanded = qsExpanded;

        updateAlgorithmLayoutMinHeight();

        updateScrollability();

    }



    public void setQsExpansionFraction(float qsExpansionFraction) {