diff options
| author | Adam Cohen <adamcohen@google.com> | 2016-06-07 22:08:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-07 22:08:05 +0000 |
| commit | f0c721b7c8dff319ed3e7f3c87cd98169b44e607 (patch) | |
| tree | 8eedbd7cb388bc0eccb98d398a08d36457351725 | |
| parent | 081cca3731f99b1031bbb580f529b21a09a0581f (diff) | |
| parent | 6e92f05314ae240dccd11347ea86529066b528b3 (diff) | |
| download | android_packages_apps_Trebuchet-f0c721b7c8dff319ed3e7f3c87cd98169b44e607.tar.gz android_packages_apps_Trebuchet-f0c721b7c8dff319ed3e7f3c87cd98169b44e607.tar.bz2 android_packages_apps_Trebuchet-f0c721b7c8dff319ed3e7f3c87cd98169b44e607.zip | |
Merge "Ensure that custom actions are available to all apps items" into ub-launcher3-calgary
| -rw-r--r-- | src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java | 4 | ||||
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsGridAdapter.java | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java index aa6e08ebc..6bf8abf30 100644 --- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java +++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java @@ -118,7 +118,9 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme 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)); } } diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java index 115db9dff..81a05a23b 100644 --- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java +++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java @@ -511,12 +511,16 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter. 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: |