Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent drag-to-open from cycling pressed state, propagate hotspot" into lmp-mr1-dev

Browse Source
This commit is contained in:
Alan Viverette
2015-01-26 19:16:39 +00:00
committed by Android (Google) Code Review
parent 2b144a16f6 2563095d2d
commit de8d284055
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/android/widget/ListPopupWindow.java
View File

@@ -1648,19 +1648,32 @@ public class ListPopupWindow {
private void setPressedItem(View child, int position, float x, float y) { private void setPressedItem(View child, int position, float x, float y) {
mDrawsInPressedState = true; mDrawsInPressedState = true;
// Ordering is essential. First update the pressed state and layout // Ordering is essential. First, update the container's pressed state.
// the children. This will ensure the selector actually gets drawn. drawableHotspotChanged(x, y);
if (!isPressed()) {
setPressed(true); setPressed(true);
}
// Next, run layout if we need to stabilize child positions.
if (mDataChanged) {
layoutChildren(); layoutChildren();
}
// Manage the pressed view based on motion position. This allows us to // Manage the pressed view based on motion position. This allows us to
// play nicely with actual touch and scroll events. // play nicely with actual touch and scroll events.
final View motionView = getChildAt(mMotionPosition - mFirstPosition); final View motionView = getChildAt(mMotionPosition - mFirstPosition);
if (motionView != null) { if (motionView != null && motionView != child && motionView.isPressed()) {
motionView.setPressed(false); motionView.setPressed(false);
} }
mMotionPosition = position; mMotionPosition = position;
// Offset for child coordinates.
final float childX = x - child.getLeft();
final float childY = y - child.getTop();
child.drawableHotspotChanged(childX, childY);
if (!child.isPressed()) {
child.setPressed(true); 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);