PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge "Fix overlapping FloatingViewType IntDef" am: c73828fd96 am: ad61ce0767

Browse Source 
am: bc742b6a4f

Change-Id: Ibc1f1c11268527e6b8b5f690a7e781885a554e2f
This commit is contained in:
Sunny Goyal
2018-08-08 13:14:32 -07:00
committed by android-build-merger
parent 1cbe824167 bc742b6a4f
commit 682295fe67
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/AbstractFloatingView.java
+3 -3
View File
@@ -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