From 540913eadf39f1e8632d2b6f0bc33aa635214198 Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Mon, 23 Jan 2017 11:47:51 -0800 Subject: Refactor DeepShortcutsContainer to PopupContainerWithArrow - Also added PopupItemView, which takes animation logic from DeepShortcutView, and which DeepShortcutView now extends. - Renamed ShortcutFilter to PopupPopulator, which has support for new item types (not yet used). Also moved populating logic (e.g. UpdateShortcutChild Runnable) to PopupPopulator. Bug: 32410600 Change-Id: Ib6e444ac7ca99c80ba438801c26e62d9542e0ad9 --- src/com/android/launcher3/AbstractFloatingView.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/com/android/launcher3/AbstractFloatingView.java') diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java index 65da00211..c834c6bdb 100644 --- a/src/com/android/launcher3/AbstractFloatingView.java +++ b/src/com/android/launcher3/AbstractFloatingView.java @@ -32,11 +32,11 @@ import java.lang.annotation.RetentionPolicy; */ public abstract class AbstractFloatingView extends LinearLayout { - @IntDef(flag = true, value = {TYPE_FOLDER, TYPE_DEEPSHORTCUT_CONTAINER}) + @IntDef(flag = true, value = {TYPE_FOLDER, TYPE_POPUP_CONTAINER_WITH_ARROW}) @Retention(RetentionPolicy.SOURCE) public @interface FloatingViewType {} public static final int TYPE_FOLDER = 1 << 0; - public static final int TYPE_DEEPSHORTCUT_CONTAINER = 1 << 1; + public static final int TYPE_POPUP_CONTAINER_WITH_ARROW = 1 << 1; protected boolean mIsOpen; @@ -119,6 +119,6 @@ public abstract class AbstractFloatingView extends LinearLayout { } public static AbstractFloatingView getTopOpenView(Launcher launcher) { - return getOpenView(launcher, TYPE_FOLDER | TYPE_DEEPSHORTCUT_CONTAINER); + return getOpenView(launcher, TYPE_FOLDER | TYPE_POPUP_CONTAINER_WITH_ARROW); } } -- cgit v1.2.3