From 376c32f268be25633da2305099c82451a539d6bf Mon Sep 17 00:00:00 2001 From: Alan Viverette <alanv@google.com> Date: Mon, 1 Jun 2015 16:41:42 -0700 Subject: [PATCH] Always send VIEW_CLICKED event from AdapterView.performItemClick() This makes it consistent with View.performClick(). Bug: 19574976 Change-Id: I00b222d56aa6fac03c2e6ead0604ee2ff3a6969d --- core/java/android/widget/AdapterView.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/core/java/android/widget/AdapterView.java b/core/java/android/widget/AdapterView.java index 54e3996927ed6..696271105639d 100644 --- a/core/java/android/widget/AdapterView.java +++ b/core/java/android/widget/AdapterView.java @@ -304,16 +304,19 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup { * 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; } /** -- GitLab