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

Commit a5ecdbb1 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Manage pressed state during drag-to-open" into lmp-mr1-dev

parents 84402777 62a8b61f

core/java/android/widget/ListPopupWindow.java

+14 −0
Original line number Original line Diff line number Diff line
@@ -1639,6 +1639,11 @@ public class ListPopupWindow { 
            setPressed(false);

            setPressed(false);

            updateSelectorState();

            updateSelectorState();





            final View motionView = getChildAt(mMotionPosition - mFirstPosition);

            if (motionView != null) {

                motionView.setPressed(false);

            }



            if (mClickAnimation != null) {

            if (mClickAnimation != null) {

                mClickAnimation.cancel();

                mClickAnimation.cancel();

                mClickAnimation = null;

                mClickAnimation = null;
@@ -1653,6 +1658,15 @@ public class ListPopupWindow { 
            setPressed(true);

            setPressed(true);

            layoutChildren();

            layoutChildren();





            // Manage the pressed view based on motion position. This allows us to

            // play nicely with actual touch and scroll events.

            final View motionView = getChildAt(mMotionPosition - mFirstPosition);

            if (motionView != null) {

                motionView.setPressed(false);

            }

            mMotionPosition = position;

            child.setPressed(true);



            // Ensure that keyboard focus starts from the last touched position.

            // Ensure that keyboard focus starts from the last touched position.

            setSelectedPositionInt(position);

            setSelectedPositionInt(position);

            positionSelectorLikeTouch(position, child, x, y);

            positionSelectorLikeTouch(position, child, x, y);