Converting widget panel into a floating view
> The widget panel is only inflated when needed
> Using the swipe up/down interaction for widgets tray
> Removing additional view wrappers from all-apps
> Widget tray is preserved across activity recreation
> Launcher no longer has WIDGET state, the actual code around
the states will be removed in a follow-up cl
Bug: 67678570
Bug: 67585158
Change-Id: Ia29a7c33ec81e6c53cc24e2906b7022b6f41755b
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java
index 0fbad52..62e0fb1 100644
--- a/src/com/android/launcher3/AbstractFloatingView.java
+++ b/src/com/android/launcher3/AbstractFloatingView.java
@@ -20,6 +20,7 @@
import android.content.Context;
import android.support.annotation.IntDef;
import android.util.AttributeSet;
+import android.util.Log;
import android.view.MotionEvent;
import android.view.View;
import android.widget.LinearLayout;
@@ -40,7 +41,8 @@
TYPE_FOLDER,
TYPE_ACTION_POPUP,
TYPE_WIDGETS_BOTTOM_SHEET,
- TYPE_WIDGET_RESIZE_FRAME
+ TYPE_WIDGET_RESIZE_FRAME,
+ TYPE_WIDGETS_FULL_SHEET
})
@Retention(RetentionPolicy.SOURCE)
public @interface FloatingViewType {}
@@ -48,6 +50,10 @@
public static final int TYPE_ACTION_POPUP = 1 << 1;
public static final int TYPE_WIDGETS_BOTTOM_SHEET = 1 << 2;
public static final int TYPE_WIDGET_RESIZE_FRAME = 1 << 3;
+ public static final int TYPE_WIDGETS_FULL_SHEET = 1 << 4;
+
+ public static final int TYPE_ALL = TYPE_FOLDER | TYPE_ACTION_POPUP
+ | TYPE_WIDGETS_BOTTOM_SHEET | TYPE_WIDGET_RESIZE_FRAME | TYPE_WIDGETS_FULL_SHEET;
protected boolean mIsOpen;
@@ -121,24 +127,31 @@
}
}
- public static void closeAllOpenViews(Launcher launcher, boolean animate) {
+ public static void closeOpenViews(Launcher launcher, boolean animate,
+ @FloatingViewType int type) {
DragLayer dragLayer = launcher.getDragLayer();
// Iterate in reverse order. AbstractFloatingView is added later to the dragLayer,
// and will be one of the last views.
for (int i = dragLayer.getChildCount() - 1; i >= 0; i--) {
View child = dragLayer.getChildAt(i);
if (child instanceof AbstractFloatingView) {
- ((AbstractFloatingView) child).close(animate);
+ AbstractFloatingView abs = (AbstractFloatingView) child;
+ if (abs.isOfType(type)) {
+ abs.close(animate);
+ }
}
}
}
+ public static void closeAllOpenViews(Launcher launcher, boolean animate) {
+ closeOpenViews(launcher, animate, TYPE_ALL);
+ }
+
public static void closeAllOpenViews(Launcher launcher) {
closeAllOpenViews(launcher, true);
}
public static AbstractFloatingView getTopOpenView(Launcher launcher) {
- return getOpenView(launcher, TYPE_FOLDER | TYPE_ACTION_POPUP
- | TYPE_WIDGETS_BOTTOM_SHEET | TYPE_WIDGET_RESIZE_FRAME);
+ return getOpenView(launcher, TYPE_ALL);
}
}