commit 055c22e8e658dcb87447a9c11ec492c2b8e922e5
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Oct 03 17:56:50 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 03 17:56:50 2019 +0000
tree e0c7334800aa34b2a1097a84007dac1483a10c7c
parent a61914194e9b4be72683b643d29741f72f60e998
parent d7fdcab612d9c8136283ea432a24800a9cdbfdc8

Merge "correct naming and add comments for test case of custom shortcut." into ub-launcher3-qt-future-dev

src/com/android/launcher3/AbstractFloatingView.java

diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java
index 8fddf3c..af2cdc3 100644
--- a/src/com/android/launcher3/AbstractFloatingView.java
+++ b/src/com/android/launcher3/AbstractFloatingView.java
@@ -16,7 +16,6 @@
 
 package com.android.launcher3;
 
-import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_FOCUSED;
 import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED;
 import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED;
 
@@ -30,6 +29,7 @@
 import android.util.Pair;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.LinearLayout;
 
 import androidx.annotation.IntDef;
@@ -171,7 +171,7 @@
                 targetInfo.first, TYPE_WINDOW_STATE_CHANGED, targetInfo.second);
 
         if (mIsOpen) {
-            sendAccessibilityEvent(TYPE_VIEW_FOCUSED);
+            performAccessibilityAction(AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS, null);
         }
         ActivityContext.lookupContext(getContext()).getDragLayer()
                 .sendAccessibilityEvent(TYPE_WINDOW_CONTENT_CHANGED);