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

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

Browse Source 
* commit 'ea653eb83f979b739fb2a934910e3bb8c87b7ea7':
  Update cached child enabled state before selector state
This commit is contained in:
Alan Viverette
2015-05-27 00:18:48 +00:00
committed by Android Git Automerger
parent 618d576899 ea653eb83f
commit bd24d2c73d
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/widget/AbsListView.java
View File

@@ -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