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

Commit 815be93d authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed an issue where the clear all expansion wasn't smooth" into pi-dev 

am: 95784b24

Change-Id: I730b4905d74c645a4818e1ce395d6c0bd9bdb2de
parents 054d930f 95784b24

packages/SystemUI/src/com/android/systemui/statusbar/StackScrollerDecorView.java

+4 −0
Original line number Diff line number Diff line
@@ -94,6 +94,10 @@ public abstract class StackScrollerDecorView extends ExpandableView { 
        }

    }



    public boolean isContentVisible() {

        return mContentVisible;

    }



    /**

     * Make this view visible. If {@code false} is passed, the view will fade out it's content

     * and set the view Visibility to GONE. If only the content should be changed

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

+1 −1
Original line number Diff line number Diff line
@@ -2199,7 +2199,7 @@ public class NotificationPanelView extends PanelView implements 


    @Override

    protected boolean isClearAllVisible() {

        return mNotificationStackScroller.isFooterViewVisible();

        return mNotificationStackScroller.isFooterViewContentVisible();

    }



    @Override

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

+2 −2
Original line number Diff line number Diff line
@@ -4117,8 +4117,8 @@ public class NotificationStackScrollLayout extends ViewGroup 
                && !mFooterView.willBeGone();

    }



    public boolean isFooterViewVisible() {

        return mFooterView != null && mFooterView.isVisible();

    public boolean isFooterViewContentVisible() {

        return mFooterView != null && mFooterView.isContentVisible();

    }



    public int getFooterViewHeight() {