diff options
author | Vadim Tryshev <vadimt@google.com> | 2015-08-19 17:55:02 -0700 |
---|---|---|
committer | Vadim Tryshev <vadimt@google.com> | 2015-08-20 07:45:57 -0700 |
commit | fedca43d396d6fd7c46fbb2f37dfa7cfe3b31834 (patch) | |
tree | 111a7ede5c82806b82b47f7ba5b827750796f5b1 | |
parent | 08efde7e247690a71c523df33b078ab530454bbe (diff) | |
download | android_packages_apps_Trebuchet-fedca43d396d6fd7c46fbb2f37dfa7cfe3b31834.tar.gz android_packages_apps_Trebuchet-fedca43d396d6fd7c46fbb2f37dfa7cfe3b31834.tar.bz2 android_packages_apps_Trebuchet-fedca43d396d6fd7c46fbb2f37dfa7cfe3b31834.zip |
Moving drag-drop related code into a separate package.
This is per an earlier CR comment "we should probably move all this code to its own package (launcher3.dragndrop) in a separate cl".
I'm not moving DragSource because it's referred from gsa code.
Bug: 22609426
Change-Id: Ia7204dab99c0c395c66b77143a2d60411153f5f3
30 files changed, 105 insertions, 38 deletions
diff --git a/proguard.flags b/proguard.flags index a8e2b6092..a683fe188 100644 --- a/proguard.flags +++ b/proguard.flags @@ -39,7 +39,7 @@ public int getY(); } --keep class com.android.launcher3.DragLayer$LayoutParams { +-keep class com.android.launcher3.dragndrop.DragLayer$LayoutParams { public void setWidth(int); public int getWidth(); public void setHeight(int); diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 6500ebcd2..f431fb132 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -23,7 +23,7 @@ android:layout_height="match_parent" android:fitsSystemWindows="true"> - <com.android.launcher3.DragLayer + <com.android.launcher3.dragndrop.DragLayer android:id="@+id/drag_layer" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -68,7 +68,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="invisible" /> - </com.android.launcher3.DragLayer> + </com.android.launcher3.dragndrop.DragLayer> <ViewStub android:id="@+id/launcher_overlay_stub" diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index d0772ee70..a7f851e76 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -24,7 +24,7 @@ android:layout_height="match_parent" android:fitsSystemWindows="true"> - <com.android.launcher3.DragLayer + <com.android.launcher3.dragndrop.DragLayer android:id="@+id/drag_layer" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -78,7 +78,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="invisible" /> - </com.android.launcher3.DragLayer> + </com.android.launcher3.dragndrop.DragLayer> <ViewStub android:id="@+id/launcher_overlay_stub" diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 802922ec1..319a49315 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -23,7 +23,7 @@ android:layout_height="match_parent" android:fitsSystemWindows="true"> - <com.android.launcher3.DragLayer + <com.android.launcher3.dragndrop.DragLayer android:id="@+id/drag_layer" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -76,7 +76,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="invisible" /> - </com.android.launcher3.DragLayer> + </com.android.launcher3.dragndrop.DragLayer> <ViewStub android:id="@+id/launcher_overlay_stub" diff --git a/src/com/android/launcher3/AnotherWindowDropTarget.java b/src/com/android/launcher3/AnotherWindowDropTarget.java index aff36ae51..eaac6be80 100644 --- a/src/com/android/launcher3/AnotherWindowDropTarget.java +++ b/src/com/android/launcher3/AnotherWindowDropTarget.java @@ -27,7 +27,7 @@ import android.graphics.Rect; public class AnotherWindowDropTarget implements DropTarget { final Launcher mLauncher; - AnotherWindowDropTarget (Context context) { mLauncher = (Launcher) context; } + public AnotherWindowDropTarget (Context context) { mLauncher = (Launcher) context; } @Override public boolean isDropEnabled() { return true; } diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java index c87074d16..2846b55e0 100644 --- a/src/com/android/launcher3/AppWidgetResizeFrame.java +++ b/src/com/android/launcher3/AppWidgetResizeFrame.java @@ -1,5 +1,7 @@ package com.android.launcher3; +import com.android.launcher3.dragndrop.DragLayer; + import android.animation.AnimatorSet; import android.animation.ObjectAnimator; import android.animation.PropertyValuesHolder; diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java index f97179c5c..dc29f7d1e 100644 --- a/src/com/android/launcher3/ButtonDropTarget.java +++ b/src/com/android/launcher3/ButtonDropTarget.java @@ -38,6 +38,9 @@ import android.view.animation.DecelerateInterpolator; import android.view.animation.LinearInterpolator; import android.widget.TextView; +import com.android.launcher3.dragndrop.DragController; +import com.android.launcher3.dragndrop.DragLayer; +import com.android.launcher3.dragndrop.DragView; import com.android.launcher3.util.Thunk; /** diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index cd005e507..772bb7be2 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -405,7 +405,7 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { mIsDragTarget = false; } - boolean isDragTarget() { + public boolean isDragTarget() { return mIsDragTarget; } @@ -425,7 +425,7 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { } } - boolean getIsDragOverlapping() { + public boolean getIsDragOverlapping() { return mIsDragOverlapping; } @@ -2802,10 +2802,10 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { // X coordinate of the view in the layout. @ViewDebug.ExportedProperty - int x; + public int x; // Y coordinate of the view in the layout. @ViewDebug.ExportedProperty - int y; + public int y; boolean dropped; diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java index bf5bc178e..32bf19254 100644 --- a/src/com/android/launcher3/DeleteDropTarget.java +++ b/src/com/android/launcher3/DeleteDropTarget.java @@ -24,6 +24,7 @@ import android.util.AttributeSet; import android.view.View; import android.view.animation.AnimationUtils; +import com.android.launcher3.dragndrop.DragLayer; import com.android.launcher3.util.FlingAnimation; import com.android.launcher3.util.Thunk; diff --git a/src/com/android/launcher3/DropTarget.java b/src/com/android/launcher3/DropTarget.java index 374846445..592cd3277 100644 --- a/src/com/android/launcher3/DropTarget.java +++ b/src/com/android/launcher3/DropTarget.java @@ -16,6 +16,8 @@ package com.android.launcher3; +import com.android.launcher3.dragndrop.DragView; + import android.graphics.PointF; import android.graphics.Rect; diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 4af56ac6e..afb5fd875 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -52,11 +52,13 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.android.launcher3.CellLayout.CellInfo; -import com.android.launcher3.DragController.DragListener; import com.android.launcher3.FolderInfo.FolderListener; import com.android.launcher3.UninstallDropTarget.UninstallSource; import com.android.launcher3.Workspace.ItemOperator; import com.android.launcher3.accessibility.LauncherAccessibilityDelegate.AccessibilityDragSource; +import com.android.launcher3.dragndrop.DragController; +import com.android.launcher3.dragndrop.DragController.DragListener; +import com.android.launcher3.dragndrop.DragLayer; import com.android.launcher3.util.Thunk; import com.android.launcher3.util.UiThreadCircularReveal; diff --git a/src/com/android/launcher3/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java index de0df0dee..a175d8692 100644 --- a/src/com/android/launcher3/FolderIcon.java +++ b/src/com/android/launcher3/FolderIcon.java @@ -43,6 +43,8 @@ import android.widget.TextView; import com.android.launcher3.DropTarget.DragObject; import com.android.launcher3.FolderInfo.FolderListener; +import com.android.launcher3.dragndrop.DragLayer; +import com.android.launcher3.dragndrop.DragView; import com.android.launcher3.util.Thunk; import java.util.ArrayList; diff --git a/src/com/android/launcher3/FolderPagedView.java b/src/com/android/launcher3/FolderPagedView.java index cc9c5738a..d8ef34e1c 100644 --- a/src/com/android/launcher3/FolderPagedView.java +++ b/src/com/android/launcher3/FolderPagedView.java @@ -30,6 +30,7 @@ import android.view.animation.OvershootInterpolator; import com.android.launcher3.FocusHelper.PagedFolderKeyEventListener; import com.android.launcher3.PageIndicator.PageMarkerResources; import com.android.launcher3.Workspace.ItemOperator; +import com.android.launcher3.dragndrop.DragController; import com.android.launcher3.util.Thunk; import java.util.ArrayList; diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index ffa98c5cf..62e08164c 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -103,6 +103,9 @@ import com.android.launcher3.compat.LauncherAppsCompat; import com.android.launcher3.compat.UserHandleCompat; import com.android.launcher3.compat.UserManagerCompat; import com.android.launcher3.config.ProviderConfig; +import com.android.launcher3.dragndrop.DragController; +import com.android.launcher3.dragndrop.DragLayer; +import com.android.launcher3.dragndrop.DragView; import com.android.launcher3.model.WidgetsModel; import com.android.launcher3.util.ComponentKey; import com.android.launcher3.util.LongArrayMap; @@ -131,7 +134,7 @@ import java.util.concurrent.atomic.AtomicInteger; public class Launcher extends Activity implements View.OnClickListener, OnLongClickListener, LauncherModel.Callbacks, View.OnTouchListener, PageSwitchListener, LauncherProviderChangeListener { - static final String TAG = "Launcher"; + public static final String TAG = "Launcher"; static final boolean LOGD = false; static final boolean PROFILE_STARTUP = false; diff --git a/src/com/android/launcher3/LauncherAppWidgetHostView.java b/src/com/android/launcher3/LauncherAppWidgetHostView.java index cf461a5b8..d8cb68207 100644 --- a/src/com/android/launcher3/LauncherAppWidgetHostView.java +++ b/src/com/android/launcher3/LauncherAppWidgetHostView.java @@ -26,7 +26,8 @@ import android.view.ViewConfiguration; import android.view.ViewGroup; import android.widget.RemoteViews; -import com.android.launcher3.DragLayer.TouchCompleteListener; +import com.android.launcher3.dragndrop.DragLayer; +import com.android.launcher3.dragndrop.DragLayer.TouchCompleteListener; /** * {@inheritDoc} diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 3702cdaf8..28e336764 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -63,7 +63,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc // the min drag distance for a fling to register, to prevent random page shifts private static final int MIN_LENGTH_FOR_FLING = 25; - protected static final int PAGE_SNAP_ANIMATION_DURATION = 750; + public static final int PAGE_SNAP_ANIMATION_DURATION = 750; protected static final int SLOW_PAGE_SNAP_ANIMATION_DURATION = 950; private static final float RETURN_TO_ORIGINAL_PAGE_THRESHOLD = 0.33f; @@ -381,7 +381,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc /** * Returns the index of page to be shown immediately afterwards. */ - int getNextPage() { + public int getNextPage() { return (mNextPage != INVALID_PAGE) ? mNextPage : mCurrentPage; } diff --git a/src/com/android/launcher3/SearchDropTargetBar.java b/src/com/android/launcher3/SearchDropTargetBar.java index f54d9d8fc..4600de0d0 100644 --- a/src/com/android/launcher3/SearchDropTargetBar.java +++ b/src/com/android/launcher3/SearchDropTargetBar.java @@ -26,6 +26,7 @@ import android.view.accessibility.AccessibilityManager; import android.view.animation.AccelerateInterpolator; import android.widget.FrameLayout; +import com.android.launcher3.dragndrop.DragController; import com.android.launcher3.util.Thunk; /* diff --git a/src/com/android/launcher3/ShortcutInfo.java b/src/com/android/launcher3/ShortcutInfo.java index f2c46defb..a86a2f9a5 100644 --- a/src/com/android/launcher3/ShortcutInfo.java +++ b/src/com/android/launcher3/ShortcutInfo.java @@ -70,7 +70,7 @@ public class ShortcutInfo extends ItemInfo { /** * The intent used to start the application. */ - Intent intent; + public Intent intent; /** * Indicates whether the icon comes from an application's resource (if false) diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 387fd1f3d..5ad846517 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -68,6 +68,11 @@ import com.android.launcher3.accessibility.LauncherAccessibilityDelegate.Accessi import com.android.launcher3.accessibility.OverviewScreenAccessibilityDelegate; import com.android.launcher3.compat.UserHandleCompat; import com.android.launcher3.config.ProviderConfig; +import com.android.launcher3.dragndrop.DragController; +import com.android.launcher3.dragndrop.DragLayer; +import com.android.launcher3.dragndrop.DragScroller; +import com.android.launcher3.dragndrop.DragView; +import com.android.launcher3.dragndrop.SpringLoadedDragController; import com.android.launcher3.util.LongArrayMap; import com.android.launcher3.util.Thunk; import com.android.launcher3.util.WallpaperUtils; diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java index f0975851d..011f4a2b1 100644 --- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java +++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java @@ -30,6 +30,7 @@ import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityNodeInfo; import android.view.animation.DecelerateInterpolator; +import com.android.launcher3.dragndrop.DragLayer; import com.android.launcher3.util.Thunk; import java.util.HashMap; diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java index c11aab995..947968587 100644 --- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java +++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java @@ -20,7 +20,6 @@ import com.android.launcher3.AppInfo; import com.android.launcher3.AppWidgetResizeFrame; import com.android.launcher3.CellLayout; import com.android.launcher3.DeleteDropTarget; -import com.android.launcher3.DragController.DragListener; import com.android.launcher3.DragSource; import com.android.launcher3.Folder; import com.android.launcher3.FolderInfo; @@ -36,6 +35,7 @@ import com.android.launcher3.R; import com.android.launcher3.ShortcutInfo; import com.android.launcher3.UninstallDropTarget; import com.android.launcher3.Workspace; +import com.android.launcher3.dragndrop.DragController.DragListener; import com.android.launcher3.util.Thunk; import java.util.ArrayList; diff --git a/src/com/android/launcher3/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java index ea41f3f17..97315cf04 100644 --- a/src/com/android/launcher3/DragController.java +++ b/src/com/android/launcher3/dragndrop/DragController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.launcher3; +package com.android.launcher3.dragndrop; import android.content.ComponentName; import android.content.Context; @@ -35,8 +35,18 @@ import android.view.View; import android.view.ViewConfiguration; import android.view.inputmethod.InputMethodManager; +import com.android.launcher3.DeleteDropTarget; +import com.android.launcher3.DragSource; +import com.android.launcher3.DropTarget; +import com.android.launcher3.ItemInfo; +import com.android.launcher3.Launcher; +import com.android.launcher3.PagedView; +import com.android.launcher3.ShortcutInfo; +import com.android.launcher3.Utilities; import com.android.launcher3.util.Thunk; +import com.android.launcher3.R; + import java.util.ArrayList; import java.util.HashSet; @@ -60,9 +70,9 @@ public class DragController implements DragDriver.EventListener { private static final int SCROLL_OUTSIDE_ZONE = 0; private static final int SCROLL_WAITING_IN_ZONE = 1; - static final int SCROLL_NONE = -1; - static final int SCROLL_LEFT = 0; - static final int SCROLL_RIGHT = 1; + public static final int SCROLL_NONE = -1; + public static final int SCROLL_LEFT = 0; + public static final int SCROLL_RIGHT = 1; private static final float MAX_FLING_DEGREES = 35f; @@ -420,7 +430,7 @@ public class DragController implements DragDriver.EventListener { return mTmpPoint; } - long getLastGestureUpTime() { + public long getLastGestureUpTime() { if (mDragDriver != null) { return System.currentTimeMillis(); } else { @@ -428,7 +438,7 @@ public class DragController implements DragDriver.EventListener { } } - void resetLastGestureUpTime() { + public void resetLastGestureUpTime() { mLastTouchUpTime = -1; } @@ -536,7 +546,7 @@ public class DragController implements DragDriver.EventListener { /** * Sets the view that should handle move events. */ - void setMoveTarget(View view) { + public void setMoveTarget(View view) { mMoveTarget = view; } diff --git a/src/com/android/launcher3/DragDriver.java b/src/com/android/launcher3/dragndrop/DragDriver.java index 12545fbfe..6e4b430d4 100644 --- a/src/com/android/launcher3/DragDriver.java +++ b/src/com/android/launcher3/dragndrop/DragDriver.java @@ -14,7 +14,12 @@ * limitations under the License. */ -package com.android.launcher3; +package com.android.launcher3.dragndrop; + +import com.android.launcher3.AnotherWindowDropTarget; +import com.android.launcher3.DropTarget; +import com.android.launcher3.ItemInfo; +import com.android.launcher3.Utilities; import android.content.ClipData; import android.content.Intent; diff --git a/src/com/android/launcher3/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java index f523c4986..741d5e662 100644 --- a/src/com/android/launcher3/DragLayer.java +++ b/src/com/android/launcher3/dragndrop/DragLayer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.launcher3; +package com.android.launcher3.dragndrop; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -40,9 +40,24 @@ import android.view.animation.Interpolator; import android.widget.FrameLayout; import android.widget.TextView; +import com.android.launcher3.AppWidgetResizeFrame; +import com.android.launcher3.CellLayout; +import com.android.launcher3.Folder; +import com.android.launcher3.FolderIcon; +import com.android.launcher3.InsettableFrameLayout; +import com.android.launcher3.ItemInfo; +import com.android.launcher3.Launcher; +import com.android.launcher3.LauncherAppState; +import com.android.launcher3.LauncherAppWidgetHostView; +import com.android.launcher3.SearchDropTargetBar; +import com.android.launcher3.ShortcutAndWidgetContainer; +import com.android.launcher3.Utilities; +import com.android.launcher3.Workspace; import com.android.launcher3.accessibility.LauncherAccessibilityDelegate; import com.android.launcher3.util.Thunk; +import com.android.launcher3.R; + import java.util.ArrayList; /** @@ -890,7 +905,7 @@ public class DragLayer extends InsettableFrameLayout { invalidate(); } - void showPageHints() { + public void showPageHints() { mShowPageHints = true; Workspace workspace = mLauncher.getWorkspace(); getDescendantRectRelativeToSelf(workspace.getChildAt(workspace.numCustomPages()), @@ -898,7 +913,7 @@ public class DragLayer extends InsettableFrameLayout { invalidate(); } - void hidePageHints() { + public void hidePageHints() { mShowPageHints = false; invalidate(); } diff --git a/src/com/android/launcher3/DragScroller.java b/src/com/android/launcher3/dragndrop/DragScroller.java index e261f15d8..165d0b11c 100644 --- a/src/com/android/launcher3/DragScroller.java +++ b/src/com/android/launcher3/dragndrop/DragScroller.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.launcher3; +package com.android.launcher3.dragndrop; /** * Handles scrolling while dragging diff --git a/src/com/android/launcher3/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java index 235cff006..88e11fa61 100644 --- a/src/com/android/launcher3/DragView.java +++ b/src/com/android/launcher3/dragndrop/DragView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.launcher3; +package com.android.launcher3.dragndrop; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -35,7 +35,14 @@ import android.graphics.Rect; import android.os.Build; import android.view.View; import android.view.animation.DecelerateInterpolator; + +import com.android.launcher3.Launcher; +import com.android.launcher3.LauncherAnimUtils; +import com.android.launcher3.Utilities; import com.android.launcher3.util.Thunk; + +import com.android.launcher3.R; + import java.util.Arrays; public class DragView extends View { diff --git a/src/com/android/launcher3/SpringLoadedDragController.java b/src/com/android/launcher3/dragndrop/SpringLoadedDragController.java index 45edaef86..d7f41c947 100644 --- a/src/com/android/launcher3/SpringLoadedDragController.java +++ b/src/com/android/launcher3/dragndrop/SpringLoadedDragController.java @@ -14,7 +14,13 @@ * limitations under the License. */ -package com.android.launcher3; +package com.android.launcher3.dragndrop; + +import com.android.launcher3.Alarm; +import com.android.launcher3.CellLayout; +import com.android.launcher3.Launcher; +import com.android.launcher3.OnAlarmListener; +import com.android.launcher3.Workspace; public class SpringLoadedDragController implements OnAlarmListener { // how long the user must hover over a mini-screen before it unshrinks diff --git a/src/com/android/launcher3/util/FlingAnimation.java b/src/com/android/launcher3/util/FlingAnimation.java index 55c5d7dc2..f82038bf2 100644 --- a/src/com/android/launcher3/util/FlingAnimation.java +++ b/src/com/android/launcher3/util/FlingAnimation.java @@ -7,9 +7,9 @@ import android.graphics.PointF; import android.graphics.Rect; import android.view.animation.DecelerateInterpolator; -import com.android.launcher3.DragLayer; -import com.android.launcher3.DragView; import com.android.launcher3.DropTarget.DragObject; +import com.android.launcher3.dragndrop.DragLayer; +import com.android.launcher3.dragndrop.DragView; public class FlingAnimation implements AnimatorUpdateListener { diff --git a/src/com/android/launcher3/widget/WidgetHostViewLoader.java b/src/com/android/launcher3/widget/WidgetHostViewLoader.java index 1966f9fdc..7607d8554 100644 --- a/src/com/android/launcher3/widget/WidgetHostViewLoader.java +++ b/src/com/android/launcher3/widget/WidgetHostViewLoader.java @@ -10,14 +10,14 @@ import android.os.Handler; import android.view.View; import com.android.launcher3.AppWidgetResizeFrame; -import com.android.launcher3.DragController.DragListener; -import com.android.launcher3.DragLayer; import com.android.launcher3.DragSource; import com.android.launcher3.ItemInfo; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.Utilities; import com.android.launcher3.compat.AppWidgetManagerCompat; +import com.android.launcher3.dragndrop.DragController.DragListener; +import com.android.launcher3.dragndrop.DragLayer; import com.android.launcher3.util.Thunk; public class WidgetHostViewLoader implements DragListener { diff --git a/src/com/android/launcher3/widget/WidgetsContainerView.java b/src/com/android/launcher3/widget/WidgetsContainerView.java index fd6d28baf..dfdf9643a 100644 --- a/src/com/android/launcher3/widget/WidgetsContainerView.java +++ b/src/com/android/launcher3/widget/WidgetsContainerView.java @@ -32,7 +32,6 @@ import com.android.launcher3.BaseContainerView; import com.android.launcher3.CellLayout; import com.android.launcher3.DeleteDropTarget; import com.android.launcher3.DeviceProfile; -import com.android.launcher3.DragController; import com.android.launcher3.DragSource; import com.android.launcher3.DropTarget.DragObject; import com.android.launcher3.Folder; @@ -45,6 +44,7 @@ import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.WidgetPreviewLoader; import com.android.launcher3.Workspace; +import com.android.launcher3.dragndrop.DragController; import com.android.launcher3.model.WidgetsModel; import com.android.launcher3.util.Thunk; |