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

Commit bd24d2c7 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am ea653eb8: am 9123e666: Merge "Update cached child enabled state before... 

am ea653eb8: am 9123e666: Merge "Update cached child enabled state before selector state" into mnc-dev

* commit 'ea653eb8':
  Update cached child enabled state before selector state
parents 618d5768 ea653eb8

core/java/android/widget/AbsListView.java

+7 −9
Original line number Diff line number Diff line
@@ -2568,7 +2568,13 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
        selectorRect.right += mSelectionRightPadding;

        selectorRect.bottom += mSelectionBottomPadding;



        // Update the selector drawable.

        // Update the child enabled state prior to updating the selector.

        final boolean isChildViewEnabled = sel.isEnabled();

        if (mIsChildViewEnabled != isChildViewEnabled) {

            mIsChildViewEnabled = isChildViewEnabled;

        }



        // Update the selector drawable's state and position.

        final Drawable selector = mSelector;

        if (selector != null) {

            if (positionChanged) {
@@ -2588,14 +2594,6 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
                selector.setHotspot(x, y);

            }

        }



        final boolean isChildViewEnabled = mIsChildViewEnabled;

        if (sel.isEnabled() != isChildViewEnabled) {

            mIsChildViewEnabled = !isChildViewEnabled;

            if (getSelectedItemPosition() != INVALID_POSITION) {

                refreshDrawableState();

            }

        }

    }



    @Override