Persist selector on ListView and GridView layout (e3c433aa) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -14240,6 +14240,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* @return True if the view is attached to a window and the window is
		* hardware accelerated; false in any other case.
		*/
		@ViewDebug.ExportedProperty(category = "drawing")
		public boolean isHardwareAccelerated() {
		return mAttachInfo != null && mAttachInfo.mHardwareAccelerated;
		}

+21 −5

Original line number	Diff line number	Diff line
		@@ -1326,13 +1326,29 @@ public class GridView extends AbsListView {
		if (sel != null) {
		positionSelector(INVALID_POSITION, sel);
		mSelectedTop = sel.getTop();
		} else if (mTouchMode > TOUCH_MODE_DOWN && mTouchMode < TOUCH_MODE_SCROLL) {
		View child = getChildAt(mMotionPosition - mFirstPosition);
		if (child != null) positionSelector(mMotionPosition, child);
		} else {
		final boolean inTouchMode = mTouchMode > TOUCH_MODE_DOWN
		&& mTouchMode < TOUCH_MODE_SCROLL;
		if (inTouchMode) {
		// If the user's finger is down, select the motion position.
		final View child = getChildAt(mMotionPosition - mFirstPosition);
		if (child != null) {
		positionSelector(mMotionPosition, child);
		}
		} else if (mSelectedPosition != INVALID_POSITION) {
		// If we had previously positioned the selector somewhere,
		// put it back there. It might not match up with the data,
		// but it's transitioning out so it's not a big deal.
		final View child = getChildAt(mSelectorPosition - mFirstPosition);
		if (child != null) {
		positionSelector(mSelectorPosition, child);
		}
		} else {
		// Otherwise, clear selection.
		mSelectedTop = 0;
		mSelectorRect.setEmpty();
		}
		}

		// Attempt to restore accessibility focus, if necessary.
		if (viewRootImpl != null) {

+14 −4

Original line number	Diff line number	Diff line
		@@ -1718,14 +1718,24 @@ public class ListView extends AbsListView {
		}
		mSelectedTop = sel.getTop();
		} else {
		final boolean inTouchMode = mTouchMode == TOUCH_MODE_TAP
		\|\| mTouchMode == TOUCH_MODE_DONE_WAITING;
		if (inTouchMode) {
		// If the user's finger is down, select the motion position.
		// Otherwise, clear selection.
		if (mTouchMode == TOUCH_MODE_TAP \|\| mTouchMode == TOUCH_MODE_DONE_WAITING) {
		final View child = getChildAt(mMotionPosition - mFirstPosition);
		if (child != null) {
		positionSelector(mMotionPosition, child);
		}
		} else if (mSelectorPosition != INVALID_POSITION) {
		// If we had previously positioned the selector somewhere,
		// put it back there. It might not match up with the data,
		// but it's transitioning out so it's not a big deal.
		final View child = getChildAt(mSelectorPosition - mFirstPosition);
		if (child != null) {
		positionSelector(mSelectorPosition, child);
		}
		} else {
		// Otherwise, clear selection.
		mSelectedTop = 0;
		mSelectorRect.setEmpty();
		}

+22 −18

Original line number	Diff line number	Diff line
		@@ -645,6 +645,7 @@ public class RippleDrawable extends LayerDrawable {

		@Override
		public Rect getDirtyBounds() {
		if (isProjected()) {
		final Rect drawingBounds = mDrawingBounds;
		final Rect dirtyBounds = mDirtyBounds;
		dirtyBounds.set(drawingBounds);
		@@ -664,6 +665,9 @@ public class RippleDrawable extends LayerDrawable {
		dirtyBounds.union(drawingBounds);
		dirtyBounds.union(super.getDirtyBounds());
		return dirtyBounds;
		} else {
		return getBounds();
		}
		}

		@Override