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

Commit 351ec77b authored by Selim Cinek's avatar Selim Cinek Committed by Android Git Automerger
Browse files

am cedb6dc7: Merge "Fixed a bug when double tapping a notification in the... 

am cedb6dc7: Merge "Fixed a bug when double tapping a notification in the normal shade" into lmp-dev

* commit 'cedb6dc7':
  Fixed a bug when double tapping a notification in the normal shade
parents ac293d16 cedb6dc7

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -372,6 +372,7 @@ public abstract class PanelView extends FrameLayout { 
    }

    }





    protected void onTrackingStarted() {

    protected void onTrackingStarted() {

        mClosing = false;

        mTracking = true;

        mTracking = true;

        mCollapseAfterPeek = false;

        mCollapseAfterPeek = false;

        mBar.onTrackingStarted(PanelView.this);

        mBar.onTrackingStarted(PanelView.this);

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

+10 −4
Original line number Original line Diff line number Diff line
@@ -738,8 +738,9 @@ public class StackScrollAlgorithm { 
            if (mExpandedOnStart) {

            if (mExpandedOnStart) {





                // We are collapsing the shade, so the first child can get as most as high as the

                // We are collapsing the shade, so the first child can get as most as high as the

                // current height.

                // current height or the end value of the animation.

                mFirstChildMaxHeight = mFirstChildWhileExpanding.getActualHeight();

                mFirstChildMaxHeight = StackStateAnimator.getFinalActualHeight(

                        mFirstChildWhileExpanding);

            } else {

            } else {

                updateFirstChildMaxSizeToMaxHeight();

                updateFirstChildMaxSizeToMaxHeight();

            }

            }
@@ -801,10 +802,15 @@ public class StackScrollAlgorithm { 
        this.mIsExpanded = isExpanded;

        this.mIsExpanded = isExpanded;

    }

    }





    public void notifyChildrenChanged(ViewGroup hostView) {

    public void notifyChildrenChanged(final ViewGroup hostView) {

        if (mIsExpansionChanging) {

        if (mIsExpansionChanging) {

            hostView.post(new Runnable() {

                @Override

                public void run() {

                    updateFirstChildHeightWhileExpanding(hostView);

                    updateFirstChildHeightWhileExpanding(hostView);

                }

                }

            });

        }

    }

    }





    public void setDimmed(boolean dimmed) {

    public void setDimmed(boolean dimmed) {

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

+17 −1
Original line number Original line Diff line number Diff line
@@ -709,7 +709,7 @@ public class StackStateAnimator { 
        };

        };

    }

    }





    private <T> T getChildTag(View child, int tag) {

    private static <T> T getChildTag(View child, int tag) {

        return (T) child.getTag(tag);

        return (T) child.getTag(tag);

    }

    }
@@ -848,4 +848,20 @@ public class StackStateAnimator { 
            currentAnimator.cancel();

            currentAnimator.cancel();

        }

        }

    }

    }



    /**

     * Get the end value of the height animation running on a view or the actualHeight

     * if no animation is running.

     */

    public static int getFinalActualHeight(ExpandableView view) {

        if (view == null) {

            return 0;

        }

        ValueAnimator heightAnimator = getChildTag(view, TAG_ANIMATOR_HEIGHT);

        if (heightAnimator == null) {

            return view.getActualHeight();

        } else {

            return getChildTag(view, TAG_END_HEIGHT);

        }

    }

}
 
}