commit e98bcdbb9cd7072818aed13c23c2c9e9d6a56cb6
author Winson <winsonc@google.com> Wed Oct 07 20:40:27 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 07 20:40:27 2015 +0000
tree 286682af587500616412d5bd0861a317594dae0c
parent 0d6021ae6d1e3fda37dcb7708cbfb6909cf57af8
parent 34ef93ccd6e2cdb4b12cf7bf6bedf8216662e2b2

am 34ef93cc: am 058c21db: Ensure accessibility delegate is set on all apps icons.

* commit '34ef93ccd6e2cdb4b12cf7bf6bedf8216662e2b2':
  Ensure accessibility delegate is set on all apps icons.

src/com/android/launcher3/allapps/AllAppsGridAdapter.java

diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index b7fa43d..4803c62 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -40,6 +40,7 @@
 import com.android.launcher3.AppInfo;
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.util.Thunk;
@@ -472,6 +473,8 @@
                 icon.setLongPressTimeout(ViewConfiguration.get(parent.getContext())
                         .getLongPressTimeout());
                 icon.setFocusable(true);
+                icon.setAccessibilityDelegate(
+                        LauncherAppState.getInstance().getAccessibilityDelegate());
                 return new ViewHolder(icon);
             }
             case PREDICTION_ICON_VIEW_TYPE: {
@@ -483,6 +486,8 @@
                 icon.setLongPressTimeout(ViewConfiguration.get(parent.getContext())
                         .getLongPressTimeout());
                 icon.setFocusable(true);
+                icon.setAccessibilityDelegate(
+                        LauncherAppState.getInstance().getAccessibilityDelegate());
                 return new ViewHolder(icon);
             }
             case EMPTY_SEARCH_VIEW_TYPE: