Merge "Allow overriding DragController and drag use cases" into tm-qpr-dev (a8dcd442) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/Launcher.java

+9 −2

Original line number	Original line	Diff line number	Diff line
	@@ -305,7 +305,6 @@ public class Launcher extends StatefulActivity<LauncherState>
	Workspace<?> mWorkspace;		Workspace<?> mWorkspace;
	@Thunk		@Thunk
	DragLayer mDragLayer;		DragLayer mDragLayer;
	private DragController mDragController;

	private WidgetManagerHelper mAppWidgetManager;		private WidgetManagerHelper mAppWidgetManager;
	private LauncherAppWidgetHost mAppWidgetHost;		private LauncherAppWidgetHost mAppWidgetHost;
	@@ -369,6 +368,7 @@ public class Launcher extends StatefulActivity<LauncherState>
	private RotationHelper mRotationHelper;		private RotationHelper mRotationHelper;

	protected LauncherOverlayManager mOverlayManager;		protected LauncherOverlayManager mOverlayManager;
			protected DragController mDragController;
	// If true, overlay callbacks are deferred		// If true, overlay callbacks are deferred
	private boolean mDeferOverlayCallbacks;		private boolean mDeferOverlayCallbacks;
	private final Runnable mDeferredOverlayCallbacks = this::checkIfOverlayStillDeferred;		private final Runnable mDeferredOverlayCallbacks = this::checkIfOverlayStillDeferred;
	@@ -465,7 +465,7 @@ public class Launcher extends StatefulActivity<LauncherState>
	mIconCache = app.getIconCache();		mIconCache = app.getIconCache();
	mAccessibilityDelegate = createAccessibilityDelegate();		mAccessibilityDelegate = createAccessibilityDelegate();

	mDragController = new LauncherDragController(this);		initDragController();
	mAllAppsController = new AllAppsTransitionController(this);		mAllAppsController = new AllAppsTransitionController(this);
	mStateManager = new StateManager<>(this, NORMAL);		mStateManager = new StateManager<>(this, NORMAL);

	@@ -614,6 +614,13 @@ public class Launcher extends StatefulActivity<LauncherState>
	super.onConfigurationChanged(newConfig);		super.onConfigurationChanged(newConfig);
	}		}

			/**
			* Initializes the drag controller.
			*/
			protected void initDragController() {
			mDragController = new LauncherDragController(this);
			}

	@Override		@Override
	public void onIdpChanged(boolean modelPropertiesChanged) {		public void onIdpChanged(boolean modelPropertiesChanged) {
	initDeviceProfile(mDeviceProfile.inv);		initDeviceProfile(mDeviceProfile.inv);

src/com/android/launcher3/Workspace.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -159,7 +159,7 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T>
	private LayoutTransition mLayoutTransition;		private LayoutTransition mLayoutTransition;
	@Thunk final WallpaperManager mWallpaperManager;		@Thunk final WallpaperManager mWallpaperManager;

	private ShortcutAndWidgetContainer mDragSourceInternal;		protected ShortcutAndWidgetContainer mDragSourceInternal;

	@Thunk final IntSparseArrayMap<CellLayout> mWorkspaceScreens = new IntSparseArrayMap<>();		@Thunk final IntSparseArrayMap<CellLayout> mWorkspaceScreens = new IntSparseArrayMap<>();
	@Thunk final IntArray mScreenOrder = new IntArray();		@Thunk final IntArray mScreenOrder = new IntArray();
	@@ -195,7 +195,7 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T>
	@Thunk final Launcher mLauncher;		@Thunk final Launcher mLauncher;
	@Thunk DragController mDragController;		@Thunk DragController mDragController;

	private final int[] mTempXY = new int[2];		protected final int[] mTempXY = new int[2];
	private final float[] mTempFXY = new float[2];		private final float[] mTempFXY = new float[2];
	private final Rect mTempRect = new Rect();		private final Rect mTempRect = new Rect();
	@Thunk float[] mDragViewVisualCenter = new float[2];		@Thunk float[] mDragViewVisualCenter = new float[2];