Merge "Call getModelWriter() to get the newest version instead of using the old one" into udc-dev (5fd9a767) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/DropTargetHandler.kt

+2 −5

Original line number	Diff line number	Diff line
		@@ -6,7 +6,6 @@ import com.android.launcher3.DropTarget.DragObject
		import com.android.launcher3.SecondaryDropTarget.DeferredOnComplete
		import com.android.launcher3.dragndrop.DragLayer
		import com.android.launcher3.logging.StatsLogManager.LauncherEvent
		import com.android.launcher3.model.ModelWriter
		import com.android.launcher3.model.data.ItemInfo
		import com.android.launcher3.model.data.LauncherAppWidgetInfo
		import com.android.launcher3.util.IntSet
		@@ -22,8 +21,6 @@ import com.android.launcher3.views.Snackbar
		class DropTargetHandler(launcher: Launcher) {
		val mLauncher: Launcher = launcher

		val modelWriter: ModelWriter = mLauncher.modelWriter

		fun onDropAnimationComplete() {
		mLauncher.stateManager.goToState(LauncherState.NORMAL)
		}
		@@ -87,7 +84,7 @@ class DropTargetHandler(launcher: Launcher) {
		else mLauncher.workspace.currentPageScreenIds
		val onUndoClicked = Runnable {
		mLauncher.setPagesToBindSynchronously(pageIds)
		modelWriter.abortDelete()
		mLauncher.modelWriter.abortDelete()
		mLauncher.statsLogManager.logger().log(LauncherEvent.LAUNCHER_UNDO)
		}

		@@ -95,7 +92,7 @@ class DropTargetHandler(launcher: Launcher) {
		mLauncher,
		R.string.item_removed,
		R.string.undo,
		modelWriter::commitDelete,
		mLauncher.modelWriter::commitDelete,
		onUndoClicked
		)
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -1621,6 +1621,9 @@ public class Launcher extends StatefulActivity<LauncherState>
		return mModel;
		}

		/**
		* Returns the ModelWriter writer, make sure to call the function every time you want to use it.
		*/
		public ModelWriter getModelWriter() {
		return mModelWriter;
		}