diff options
| author | Adam Powell <adamp@google.com> | 2017-02-08 16:21:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-02-08 16:21:06 +0000 |
| commit | 2ec94fde4feb564c9903142ebe37cebde0b201b4 (patch) | |
| tree | a820a0e4f13c27513bf0d1a81d437c6f7d574e8a /core/java/android/widget | |
| parent | b94a914c9e2446f791cf165a38dd6683c4251f0a (diff) | |
| parent | 0f552f4d50c40c60b5de315d6f3dc480ebd97888 (diff) | |
Merge "Provide old behavior for View#hasFocusable to old apps"
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/AbsListView.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 47c4cf383e61..4c9a86624468 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -2548,7 +2548,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te } private boolean isItemClickable(View view) { - return !view.hasFocusable(false); + return !view.hasExplicitFocusable(); } /** @@ -2824,7 +2824,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te final View v = getChildAt(mSelectedPosition - mFirstPosition); if (v != null) { - if (v.hasFocusable(false)) return; + if (v.hasExplicitFocusable()) return; v.setPressed(true); } setPressed(true); @@ -3428,7 +3428,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te if (mTouchMode == TOUCH_MODE_DOWN) { mTouchMode = TOUCH_MODE_TAP; final View child = getChildAt(mMotionPosition - mFirstPosition); - if (child != null && !child.hasFocusable(false)) { + if (child != null && !child.hasExplicitFocusable()) { mLayoutMode = LAYOUT_NORMAL; if (!mDataChanged) { @@ -4005,7 +4005,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te final float x = ev.getX(); final boolean inList = x > mListPadding.left && x < getWidth() - mListPadding.right; - if (inList && !child.hasFocusable(false)) { + if (inList && !child.hasExplicitFocusable()) { if (mPerformClick == null) { mPerformClick = new PerformClick(); } |