summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBecky Qiu <xuqiu@google.com>2019-07-12 21:15:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-07-12 21:15:25 +0000
commit75970447a758a445eef52d70afa5087f043ca2e0 (patch)
tree22a111fa05cd5843ffc0a034be70c0036edc125f
parent08159a5b085091cdbd0b9d542b1e6a2e2f63a02b (diff)
parent8874e5f8a7d575341b1ec34d3f16b624e615834b (diff)
downloadandroid_packages_apps_Trebuchet-75970447a758a445eef52d70afa5087f043ca2e0.tar.gz
android_packages_apps_Trebuchet-75970447a758a445eef52d70afa5087f043ca2e0.tar.bz2
android_packages_apps_Trebuchet-75970447a758a445eef52d70afa5087f043ca2e0.zip
Merge "Fill the logging container in the AllAppsContainerView" into ub-launcher3-qt-r1-dev
-rw-r--r--src/com/android/launcher3/allapps/AllAppsContainerView.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 12a493013..4a2109e58 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -50,6 +50,7 @@ import com.android.launcher3.Utilities;
import com.android.launcher3.compat.AccessibilityManagerCompat;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.keyboard.FocusedItemDecorator;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
import com.android.launcher3.util.ItemInfoMatcher;
import com.android.launcher3.util.MultiValueAlpha;
@@ -297,7 +298,11 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
@Override
public void fillInLogContainerData(View v, ItemInfo info, Target target, Target targetParent) {
- // This is filled in {@link AllAppsRecyclerView}
+ if (getApps().hasFilter()) {
+ targetParent.containerType = ContainerType.SEARCHRESULT;
+ } else {
+ targetParent.containerType = ContainerType.ALLAPPS;
+ }
}
@Override