commit 945caeeaa8f5dfacdb878239e0bfa8c9d11d9339
author Jeff Brown <jeffbrown@google.com> Thu Jul 14 22:31:40 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 14 22:31:40 2011 -0700
tree 85a4fabeb747b68aab8b2a97373d69946594d45b
parent 5bd512a131a269b9a42abf4f7200672df976afe1
parent a79f4b7df9d6d80b9371ba289040a60fa93bb87c

Merge "Refresh the drawable state when selecting a position."

core/java/android/widget/AbsListView.java

diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index 6b80608..1e10a71 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -271,12 +271,6 @@
     Drawable mSelector;
 
     /**
-     * Set to true if we would like to have the selector showing itself.
-     * We still need to draw and position it even if this is false.
-     */
-    boolean mSelectorShowing;
-
-    /**
      * The current position of the selector in the list.
      */
     int mSelectorPosition = INVALID_POSITION;
@@ -1669,7 +1663,6 @@
         setSelectedPositionInt(INVALID_POSITION);
         setNextSelectedPositionInt(INVALID_POSITION);
         mSelectedTop = 0;
-        mSelectorShowing = false;
         mSelectorPosition = INVALID_POSITION;
         mSelectorRect.setEmpty();
         invalidate();
@@ -2025,7 +2018,7 @@
         final boolean isChildViewEnabled = mIsChildViewEnabled;
         if (sel.isEnabled() != isChildViewEnabled) {
             mIsChildViewEnabled = !isChildViewEnabled;
-            if (mSelectorShowing) {
+            if (getSelectedItemPosition() != INVALID_POSITION) {
                 refreshDrawableState();
             }
         }
@@ -4529,7 +4522,6 @@
             setSelectedPositionInt(INVALID_POSITION);
             setNextSelectedPositionInt(INVALID_POSITION);
             mSelectedTop = 0;
-            mSelectorShowing = false;
         }
     }