commit 26a4f6c831a27e043a5a847d5358ce0a27e9e2ac
author Adam Cohen <adamcohen@google.com> Tue Jun 07 22:30:30 2016 +0000
committer Adam Cohen <adamcohen@google.com> Tue Jun 07 22:30:30 2016 +0000
tree 7da13cffef5cf1b21bb5acbf78ade353817129b4
parent 677ce21fbfb8b40b22542347b9be1812f4360e7c

Revert "Ensure that custom actions are available to all apps items"

This reverts commit 677ce21fbfb8b40b22542347b9be1812f4360e7c.

Change-Id: I7fc13142de9946e0b482160fa4c067461e471f52

src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java

diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
index 646b463..2306b77 100644
--- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
+++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
@@ -118,9 +118,7 @@
                     info.addAction(mActions.get(RESIZE));
                 }
             }
-        }
-
-        if ((item instanceof AppInfo) || (item instanceof PendingAddItemInfo)) {
+        } if ((item instanceof AppInfo) || (item instanceof PendingAddItemInfo)) {
             info.addAction(mActions.get(ADD_TO_WORKSPACE));
         }
     }

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 2c9c547..42a395d 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -564,16 +564,12 @@
                 AppInfo info = mApps.getAdapterItems().get(position).appInfo;
                 BubbleTextView icon = (BubbleTextView) holder.mContent;
                 icon.applyFromApplicationInfo(info);
-                icon.setAccessibilityDelegate(
-                        LauncherAppState.getInstance().getAccessibilityDelegate());
                 break;
             }
             case PREDICTION_ICON_VIEW_TYPE: {
                 AppInfo info = mApps.getAdapterItems().get(position).appInfo;
                 BubbleTextView icon = (BubbleTextView) holder.mContent;
                 icon.applyFromApplicationInfo(info);
-                icon.setAccessibilityDelegate(
-                        LauncherAppState.getInstance().getAccessibilityDelegate());
                 break;
             }
             case EMPTY_SEARCH_VIEW_TYPE: