commit 343a77e609382bcb9b1d69ea235a9e6d779b719e
author Tony Wickham <twickham@google.com> Wed Apr 12 18:31:09 2017 -0700
committer Tony Wickham <twickham@google.com> Mon Apr 17 11:44:41 2017 -0700
tree 774becd5e7cbd6a8057ffcdc333ac2476bc49695
parent 251dabfd765cd4422ff3fd2d6a7f70834413831c

Rename WidgetsAndMore to WidgetsBottomSheet

(It only contains widgets now.)

Bug: 35766387
Change-Id: I5864791a9741d1c56ac6df30125fe7a4a677b4bd

src/com/android/launcher3/AbstractFloatingView.java

diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java
index 1f12034..597e937 100644
--- a/src/com/android/launcher3/AbstractFloatingView.java
+++ b/src/com/android/launcher3/AbstractFloatingView.java
@@ -37,13 +37,13 @@
     @IntDef(flag = true, value = {
             TYPE_FOLDER,
             TYPE_POPUP_CONTAINER_WITH_ARROW,
-            TYPE_WIDGETS_AND_MORE
+            TYPE_WIDGETS_BOTTOM_SHEET
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface FloatingViewType {}
     public static final int TYPE_FOLDER = 1 << 0;
     public static final int TYPE_POPUP_CONTAINER_WITH_ARROW = 1 << 1;
-    public static final int TYPE_WIDGETS_AND_MORE = 1 << 2;
+    public static final int TYPE_WIDGETS_BOTTOM_SHEET = 1 << 2;
 
     protected boolean mIsOpen;
 
@@ -139,7 +139,7 @@
 
     public static AbstractFloatingView getTopOpenView(Launcher launcher) {
         return getOpenView(launcher, TYPE_FOLDER | TYPE_POPUP_CONTAINER_WITH_ARROW
-                | TYPE_WIDGETS_AND_MORE);
+                | TYPE_WIDGETS_BOTTOM_SHEET);
     }
 
     public abstract int getLogContainerType();