diff options
| author | Tony Wickham <twickham@google.com> | 2016-08-12 20:36:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-12 20:36:40 +0000 |
| commit | d8f951f923caaa1272959acfe4957475b48ac6f5 (patch) | |
| tree | 30d42ca3b3128117c345bc5cb002cee76d74d042 /src/com/android/launcher3/allapps/AllAppsRecyclerView.java | |
| parent | 9e22de7cb3a770ac99b9ee6fe2e52d7e3252a97a (diff) | |
| parent | be06874c8105cf1beec8171235600da9f4ee035e (diff) | |
| download | android_packages_apps_Trebuchet-d8f951f923caaa1272959acfe4957475b48ac6f5.tar.gz android_packages_apps_Trebuchet-d8f951f923caaa1272959acfe4957475b48ac6f5.tar.bz2 android_packages_apps_Trebuchet-d8f951f923caaa1272959acfe4957475b48ac6f5.zip | |
Log shortcuts open on ACTION_UP instead of in showForIcon().
am: be06874c81
Change-Id: Iefc3b03644c2c197f0b744bb9f42fd3058624377
Diffstat (limited to 'src/com/android/launcher3/allapps/AllAppsRecyclerView.java')
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsRecyclerView.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java index 09076b3f9..25ed3b8ec 100644 --- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java +++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java @@ -209,12 +209,8 @@ public class AllAppsRecyclerView extends BaseRecyclerView @Override public void fillInLaunchSourceData(View v, ItemInfo info, Target target, Target targetParent) { - targetParent.containerType = getContainerType(v); - } - - public int getContainerType(View v) { if (mApps.hasFilter()) { - return LauncherLogProto.SEARCHRESULT; + targetParent.containerType = LauncherLogProto.SEARCHRESULT; } else { if (v instanceof BubbleTextView) { BubbleTextView icon = (BubbleTextView) v; @@ -223,11 +219,12 @@ public class AllAppsRecyclerView extends BaseRecyclerView List<AlphabeticalAppsList.AdapterItem> items = mApps.getAdapterItems(); AlphabeticalAppsList.AdapterItem item = items.get(position); if (item.viewType == AllAppsGridAdapter.VIEW_TYPE_PREDICTION_ICON) { - return LauncherLogProto.PREDICTION; + targetParent.containerType = LauncherLogProto.PREDICTION; + return; } } } - return LauncherLogProto.ALLAPPS; + targetParent.containerType = LauncherLogProto.ALLAPPS; } } |