Always send VIEW_CLICKED event from AdapterView.performItemClick()
This makes it consistent with View.performClick().
Bug: 19574976
Change-Id: I00b222d56aa6fac03c2e6ead0604ee2ff3a6969d
diff --git a/core/java/android/widget/AdapterView.java b/core/java/android/widget/AdapterView.java
index 54e3996..6962711 100644
--- a/core/java/android/widget/AdapterView.java
+++ b/core/java/android/widget/AdapterView.java
@@ -304,16 +304,19 @@
* called, false otherwise is returned.
*/
public boolean performItemClick(View view, int position, long id) {
+ final boolean result;
if (mOnItemClickListener != null) {
playSoundEffect(SoundEffectConstants.CLICK);
mOnItemClickListener.onItemClick(this, view, position, id);
- if (view != null) {
- view.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_CLICKED);
- }
- return true;
+ result = true;
+ } else {
+ result = false;
}
- return false;
+ if (view != null) {
+ view.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_CLICKED);
+ }
+ return result;
}
/**