Merge "Adding support for LauncherAppWidgetHostView in CellLayout" into tm-dev (50b4ddc3) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/CellLayout.java

+17 −4

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@ import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.dragndrop.DraggableView;
		import com.android.launcher3.folder.PreviewBackground;
		import com.android.launcher3.model.data.ItemInfo;
		import com.android.launcher3.model.data.LauncherAppWidgetInfo;
		import com.android.launcher3.util.CellAndSpan;
		import com.android.launcher3.util.GridOccupancy;
		import com.android.launcher3.util.ParcelableSparseArray;
		@@ -2733,12 +2734,24 @@ public class CellLayout extends ViewGroup {
		}

		public void markCellsAsOccupiedForView(View view) {
		if (view instanceof LauncherAppWidgetHostView
		&& view.getTag() instanceof LauncherAppWidgetInfo) {
		LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) view.getTag();
		mOccupied.markCells(info.cellX, info.cellY, info.spanX, info.spanY, true);
		return;
		}
		if (view == null \|\| view.getParent() != mShortcutsAndWidgets) return;
		LayoutParams lp = (LayoutParams) view.getLayoutParams();
		mOccupied.markCells(lp.cellX, lp.cellY, lp.cellHSpan, lp.cellVSpan, true);
		}

		public void markCellsAsUnoccupiedForView(View view) {
		if (view instanceof LauncherAppWidgetHostView
		&& view.getTag() instanceof LauncherAppWidgetInfo) {
		LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) view.getTag();
		mOccupied.markCells(info.cellX, info.cellY, info.spanX, info.spanY, false);
		return;
		}
		if (view == null \|\| view.getParent() != mShortcutsAndWidgets) return;
		LayoutParams lp = (LayoutParams) view.getLayoutParams();
		mOccupied.markCells(lp.cellX, lp.cellY, lp.cellHSpan, lp.cellVSpan, false);