widget.icon.dpi = dpi;
        }

<<<<<<< HEAD
        // Calculate the spans corresponding to any one of the orientations as it should not change
        // based on orientation.
        int[] minSpans = CellLayout.rectToCell(
                mIdp.portraitProfile, mContext, info.minResizeWidth, info.minResizeHeight, null);
        widget.minSpanX = (info.resizeMode & LauncherAppWidgetProviderInfo.RESIZE_HORIZONTAL) != 0
                ? minSpans[0] : -1;
        widget.minSpanY = (info.resizeMode & LauncherAppWidgetProviderInfo.RESIZE_VERTICAL) != 0
                ? minSpans[1] : -1;

=======
        widget.minSpanX = (info.resizeMode & LauncherAppWidgetProviderInfo.RESIZE_HORIZONTAL) != 0
                ? info.minSpanX : -1;
        widget.minSpanY = (info.resizeMode & LauncherAppWidgetProviderInfo.RESIZE_VERTICAL) != 0
                ? info.minSpanY : -1;
>>>>>>> 249a510ab318db461ce1ac86baca01021fe41a2c
        return widget;
    }

            widget.icon.dpi = dpi;
        }

        // Calculate the spans corresponding to any one of the orientations as it should not change
        // based on orientation.
        int[] minSpans = CellLayout.rectToCell(
                mIdp.portraitProfile, mContext, info.minResizeWidth, info.minResizeHeight, null);
        widget.minSpanX = (info.resizeMode & LauncherAppWidgetProviderInfo.RESIZE_HORIZONTAL) != 0
                ? minSpans[0] : -1;
        widget.minSpanY = (info.resizeMode & LauncherAppWidgetProviderInfo.RESIZE_VERTICAL) != 0
                ? minSpans[1] : -1;

        return widget;
    }