From f79aad63085445384086f921a754d872397594c1 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Thu, 7 Aug 2014 18:09:49 -0700
Subject: [PATCH] Send accessibility click event after calling click listener

This ensures that any state changes made by the click listener are
correctly reflected in the accessibility event.

BUG: 16847704
Change-Id: Ib0a3b3cd5879bb77c2cd3d97e923cdfa31c8051a
---
 core/java/android/view/View.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 328d67cb41070..8c2048d4b57fd 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -4649,16 +4649,18 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
      *         otherwise is returned.
      */
     public boolean performClick() {
-        sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_CLICKED);
-
-        ListenerInfo li = mListenerInfo;
+        final boolean result;
+        final ListenerInfo li = mListenerInfo;
         if (li != null && li.mOnClickListener != null) {
             playSoundEffect(SoundEffectConstants.CLICK);
             li.mOnClickListener.onClick(this);
-            return true;
+            result = true;
+        } else {
+            result = false;
         }
 
-        return false;
+        sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_CLICKED);
+        return result;
     }
 
     /**