diff options
| author | Tony Wickham <twickham@google.com> | 2017-04-12 18:31:09 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2017-04-17 11:44:41 -0700 |
| commit | 343a77e609382bcb9b1d69ea235a9e6d779b719e (patch) | |
| tree | 774becd5e7cbd6a8057ffcdc333ac2476bc49695 /src/com/android/launcher3/dragndrop | |
| parent | 251dabfd765cd4422ff3fd2d6a7f70834413831c (diff) | |
| download | android_packages_apps_Trebuchet-343a77e609382bcb9b1d69ea235a9e6d779b719e.tar.gz android_packages_apps_Trebuchet-343a77e609382bcb9b1d69ea235a9e6d779b719e.tar.bz2 android_packages_apps_Trebuchet-343a77e609382bcb9b1d69ea235a9e6d779b719e.zip | |
Rename WidgetsAndMore to WidgetsBottomSheet
(It only contains widgets now.)
Bug: 35766387
Change-Id: I5864791a9741d1c56ac6df30125fe7a4a677b4bd
Diffstat (limited to 'src/com/android/launcher3/dragndrop')
| -rw-r--r-- | src/com/android/launcher3/dragndrop/DragLayer.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java index b04d5b747..14f4e6cb6 100644 --- a/src/com/android/launcher3/dragndrop/DragLayer.java +++ b/src/com/android/launcher3/dragndrop/DragLayer.java @@ -58,10 +58,9 @@ import com.android.launcher3.folder.Folder; import com.android.launcher3.folder.FolderIcon; import com.android.launcher3.keyboard.ViewGroupFocusHelper; import com.android.launcher3.logging.LoggerUtils; -import com.android.launcher3.userevent.nano.LauncherLogProto; import com.android.launcher3.util.Thunk; import com.android.launcher3.util.TouchController; -import com.android.launcher3.widget.WidgetsAndMore; +import com.android.launcher3.widget.WidgetsBottomSheet; import java.util.ArrayList; @@ -247,9 +246,9 @@ public class DragLayer extends InsettableFrameLayout { return true; } - WidgetsAndMore widgetsAndMore = WidgetsAndMore.getOpen(mLauncher); - if (widgetsAndMore != null && widgetsAndMore.onControllerInterceptTouchEvent(ev)) { - mActiveController = widgetsAndMore; + WidgetsBottomSheet widgetsBottomSheet = WidgetsBottomSheet.getOpen(mLauncher); + if (widgetsBottomSheet != null && widgetsBottomSheet.onControllerInterceptTouchEvent(ev)) { + mActiveController = widgetsBottomSheet; return true; } |