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

Commit 9ebc9f46 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 3ac51b3d: Merge "Fix bug 2523622 - ListView invokes onItemClick for... 

am 3ac51b3d: Merge "Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items" into froyo

Merge commit '3ac51b3d' into froyo-plus-aosp

* commit '3ac51b3d':
  Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items
parents 82a8b363 3ac51b3d

core/java/android/widget/AbsListView.java

+12 −11
Original line number Original line Diff line number Diff line
@@ -1688,11 +1688,12 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
            // bail out before bad things happen

            // bail out before bad things happen

            if (mDataChanged) return;

            if (mDataChanged) return;





            if (mAdapter != null && mItemCount > 0 &&

            final ListAdapter adapter = mAdapter;

                    mClickMotionPosition != INVALID_POSITION &&

            final int motionPosition = mClickMotionPosition;

                    mClickMotionPosition < mAdapter.getCount() && sameWindow()) {

            if (adapter != null && mItemCount > 0 &&

                performItemClick(mChild, mClickMotionPosition, getAdapter().getItemId(

                    motionPosition != INVALID_POSITION &&

                        mClickMotionPosition));

                    motionPosition < adapter.getCount() && sameWindow()) {

                performItemClick(mChild, motionPosition, adapter.getItemId(motionPosition));

            }

            }

        }

        }

    }

    }
@@ -2118,8 +2119,8 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
                                    mPendingCheckForTap : mPendingCheckForLongPress);

                                    mPendingCheckForTap : mPendingCheckForLongPress);

                        }

                        }

                        mLayoutMode = LAYOUT_NORMAL;

                        mLayoutMode = LAYOUT_NORMAL;

                        if (!mDataChanged && mAdapter.isEnabled(motionPosition)) {

                            mTouchMode = TOUCH_MODE_TAP;

                            mTouchMode = TOUCH_MODE_TAP;

                        if (!mDataChanged) {

                            setSelectedPositionInt(mMotionPosition);

                            setSelectedPositionInt(mMotionPosition);

                            layoutChildren();

                            layoutChildren();

                            child.setPressed(true);

                            child.setPressed(true);
@@ -2141,14 +2142,14 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
                                    mTouchMode = TOUCH_MODE_REST;

                                    mTouchMode = TOUCH_MODE_REST;

                                }

                                }

                            }, ViewConfiguration.getPressedStateDuration());

                            }, ViewConfiguration.getPressedStateDuration());

                        } else {

                            mTouchMode = TOUCH_MODE_REST;

                        }

                        }

                        return true;

                        return true;

                    } else {

                    } else if (!mDataChanged && mAdapter.isEnabled(motionPosition)) {

                        if (!mDataChanged) {

                        post(performClick);

                        post(performClick);

                    }

                    }

                }

                }

                }

                mTouchMode = TOUCH_MODE_REST;

                mTouchMode = TOUCH_MODE_REST;

                break;

                break;

            case TOUCH_MODE_SCROLL:

            case TOUCH_MODE_SCROLL: