Merge "Fix overlapping FloatingViewType IntDef"

am: c73828fd96

Change-Id: I2b5f60a83ed1f07050f95f4c4240682f7ec480f6
This commit is contained in:
Sunny Goyal
2018-08-08 12:39:13 -07:00
committed by android-build-merger
@@ -68,9 +68,9 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
public static final int TYPE_DISCOVERY_BOUNCE = 1 << 6;
// Popups related to quickstep UI
public static final int TYPE_QUICKSTEP_PREVIEW = 1 << 6;
public static final int TYPE_TASK_MENU = 1 << 7;
public static final int TYPE_OPTIONS_POPUP = 1 << 8;
public static final int TYPE_QUICKSTEP_PREVIEW = 1 << 7;
public static final int TYPE_TASK_MENU = 1 << 8;
public static final int TYPE_OPTIONS_POPUP = 1 << 9;
public static final int TYPE_ALL = TYPE_FOLDER | TYPE_ACTION_POPUP
| TYPE_WIDGETS_BOTTOM_SHEET | TYPE_WIDGET_RESIZE_FRAME | TYPE_WIDGETS_FULL_SHEET