Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6788b739 authored by Pierre Barbier de Reuille's avatar Pierre Barbier de Reuille Committed by Android (Google) Code Review
Browse files

Merge changes Id2a8d12e,I06353ba4 into sc-dev 

* changes:
  Use the computation of the widget size including padding.
  Avoid calling AppWidgetHostViedw#updateAppWidgetSize
parents 1fe5fda3 a7b3a14e

src/com/android/launcher3/widget/DatabaseWidgetPreviewLoader.java

+2 −1
Original line number Diff line number Diff line
@@ -417,7 +417,8 @@ public class DatabaseWidgetPreviewLoader implements WidgetPreviewLoader { 
            previewHeight = drawable.getIntrinsicHeight();

        } else {

            DeviceProfile dp = launcher.getDeviceProfile();

            Size widgetSize = WidgetSizes.getWidgetSizePx(dp, spanX, spanY);

            Size widgetSize = WidgetSizes.getWidgetPaddedSizePx(mContext, info.provider, dp, spanX,

                    spanY);

            previewWidth = widgetSize.getWidth();

            previewHeight = widgetSize.getHeight();

        }

src/com/android/launcher3/widget/WidgetCell.java

+3 −1
Original line number Diff line number Diff line
@@ -363,7 +363,9 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener { 
    /** Sets the widget preview image size, in number of cells, and preview scale. */

    public Size setPreviewSize(int spanX, int spanY, float previewScale) {

        DeviceProfile deviceProfile = mActivity.getDeviceProfile();

        Size widgetSize = WidgetSizes.getWidgetSizePx(deviceProfile, spanX, spanY);

        Size widgetSize =

                mItem != null ? WidgetSizes.getWidgetItemSizePx(getContext(), deviceProfile, mItem)

                : WidgetSizes.getWidgetSizePx(deviceProfile, spanX, spanY);

        mPreviewWidth = widgetSize.getWidth();

        mPreviewHeight = widgetSize.getHeight();

        mPreviewScale = previewScale;

src/com/android/launcher3/widget/picker/WidgetsListAdapter.java

+2 −5
Original line number Diff line number Diff line
@@ -296,11 +296,8 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC 
            for (int i = 0; i < entry.mWidgets.size(); i++) {

                WidgetItem widgetItem = entry.mWidgets.get(i);

                DeviceProfile deviceProfile = activity.getDeviceProfile();

                Size widgetSize =

                        WidgetSizes.getWidgetSizePx(

                                deviceProfile,

                                widgetItem.spanX,

                                widgetItem.spanY);

                Size widgetSize = WidgetSizes.getWidgetItemSizePx(mContext, deviceProfile,

                        widgetItem);

                if (widgetItem.isShortcut()) {

                    widgetSize =

                            new Size(

src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java

+2 −2
Original line number Diff line number Diff line
@@ -155,8 +155,8 @@ public final class WidgetsRecommendationTableLayout extends TableLayout { 
            float rowHeight = 0;

            for (int j = 0; j < widgetItems.size(); j++) {

                WidgetItem widgetItem = widgetItems.get(j);

                Size widgetSize = WidgetSizes.getWidgetSizePx(

                        deviceProfile, widgetItem.spanX, widgetItem.spanY);

                Size widgetSize = WidgetSizes.getWidgetItemSizePx(getContext(), deviceProfile,

                        widgetItem);

                float previewHeight = widgetSize.getHeight() * previewScale;

                rowHeight = Math.max(rowHeight,

                        previewHeight + mWidgetCellTextViewsHeight + mWidgetCellVerticalPadding);

src/com/android/launcher3/widget/util/WidgetSizes.java

+52 −23
Original line number Diff line number Diff line
@@ -17,9 +17,7 @@ package com.android.launcher3.widget.util; 


import static android.appwidget.AppWidgetHostView.getDefaultPaddingForWidget;



import static com.android.launcher3.Utilities.ATLEAST_S;



import android.annotation.SuppressLint;

import android.appwidget.AppWidgetHostView;

import android.appwidget.AppWidgetManager;

import android.content.ComponentName;
@@ -34,24 +32,34 @@ import androidx.annotation.Nullable; 


import com.android.launcher3.DeviceProfile;

import com.android.launcher3.LauncherAppState;

import com.android.launcher3.model.WidgetItem;



import java.util.ArrayList;

import java.util.List;

import java.util.stream.Collectors;



/** A utility class for widget sizes related calculations. */

public final class WidgetSizes {



    /**

     * Returns the list of all possible sizes, in dp, for a widget of given spans on this device.

     *

     * <p>The returned sizes already take into account the system padding, and whether it is applied

     * or not in that specific configuration.

     */

    public static ArrayList<SizeF> getWidgetSizes(Context context, int spanX, int spanY) {

    public static ArrayList<SizeF> getWidgetPaddedSizes(Context context, ComponentName provider,

            int spanX, int spanY) {

        Rect padding = getDefaultPaddingForWidget(context, provider, /* padding= */ null);



        ArrayList<SizeF> sizes = new ArrayList<>(2);

        final float density = context.getResources().getDisplayMetrics().density;

        final Point cellSize = new Point();



        for (DeviceProfile profile : LauncherAppState.getIDP(context).supportedProfiles) {

            Size widgetSizePx = getWidgetSizePx(profile, spanX, spanY, cellSize);

            if (!profile.shouldInsetWidgets()) {

                widgetSizePx = new Size(widgetSizePx.getWidth() - padding.left - padding.right,

                        widgetSizePx.getHeight() - padding.top - padding.bottom);

            }

            sizes.add(new SizeF(widgetSizePx.getWidth() / density,

                    widgetSizePx.getHeight() / density));

        }
@@ -63,6 +71,32 @@ public final class WidgetSizes { 
        return getWidgetSizePx(profile, spanX, spanY, /* recycledCellSize= */ null);

    }



    /**

     * Returns the size, in pixels and removing padding, a widget of given spans & {@code profile}.

     */

    public static Size getWidgetPaddedSizePx(Context context, ComponentName component,

            DeviceProfile profile, int spanX, int spanY) {

        Size size = getWidgetSizePx(profile, spanX, spanY);

        if (profile.shouldInsetWidgets()) {

            return size;

        }

        Rect padding = getDefaultPaddingForWidget(context, component, /* padding= */ null);

        return new Size(size.getWidth() - padding.left - padding.right,

                size.getHeight() - padding.top - padding.bottom);

    }



    /**

     * Returns the size of a WidgetItem.

     */

    public static Size getWidgetItemSizePx(Context context, DeviceProfile profile,

            WidgetItem widgetItem) {

        if (widgetItem.isShortcut()) {

            return getWidgetSizePx(profile, widgetItem.spanX, widgetItem.spanY);

        }

        return getWidgetPaddedSizePx(context, widgetItem.componentName, profile, widgetItem.spanX,

                widgetItem.spanY);

    }



    private static Size getWidgetSizePx(DeviceProfile profile, int spanX, int spanY,

            @Nullable Point recycledCellSize) {

        final int hBorderSpacing = (spanX - 1) * profile.cellLayoutBorderSpacingPx;
@@ -81,17 +115,22 @@ public final class WidgetSizes { 
     * <p>On Android S+, it also updates the given {@code widgetView} with a list of sizes derived

     * from {@code spanX}, {@code spanY} in all supported device profiles.

     */

    @SuppressLint("NewApi") // Already added API check.

    public static void updateWidgetSizeRanges(AppWidgetHostView widgetView, Context context,

            int spanX, int spanY) {

        List<SizeF> sizes = getWidgetSizes(context, spanX, spanY);

        if (ATLEAST_S) {

            widgetView.updateAppWidgetSize(new Bundle(), sizes);

        } else {

            Rect bounds = getMinMaxSizes(sizes);

            widgetView.updateAppWidgetSize(new Bundle(), bounds.left, bounds.top, bounds.right,

                    bounds.bottom);

        AppWidgetManager widgetManager = AppWidgetManager.getInstance(context);

        int widgetId = widgetView.getAppWidgetId();

        if (widgetId <= 0) {

            return;

        }

        Bundle sizeOptions = getWidgetSizeOptions(context, widgetView.getAppWidgetInfo().provider,

                spanX, spanY);

        if (sizeOptions.<SizeF>getParcelableArrayList(

                AppWidgetManager.OPTION_APPWIDGET_SIZES).equals(

                widgetManager.getAppWidgetOptions(widgetId).<SizeF>getParcelableArrayList(

                        AppWidgetManager.OPTION_APPWIDGET_SIZES))) {

            return;

        }

        widgetManager.updateAppWidgetOptions(widgetId, sizeOptions);

    }



    /**
@@ -99,17 +138,7 @@ public final class WidgetSizes { 
     */

    public static Bundle getWidgetSizeOptions(Context context, ComponentName provider, int spanX,

            int spanY) {

        ArrayList<SizeF> sizes = getWidgetSizes(context, spanX, spanY);

        Rect padding = getDefaultPaddingForWidget(context, provider, null);

        float density = context.getResources().getDisplayMetrics().density;

        float xPaddingDips = (padding.left + padding.right) / density;

        float yPaddingDips = (padding.top + padding.bottom) / density;



        ArrayList<SizeF> paddedSizes = sizes.stream()

                .map(size -> new SizeF(

                        Math.max(0.f, size.getWidth() - xPaddingDips),

                        Math.max(0.f, size.getHeight() - yPaddingDips)))

                .collect(Collectors.toCollection(ArrayList::new));

        ArrayList<SizeF> paddedSizes = getWidgetPaddedSizes(context, provider, spanX, spanY);



        Rect rect = getMinMaxSizes(paddedSizes);

        Bundle options = new Bundle();