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

Commit 3e8582d7 authored by Adam Cohen's avatar Adam Cohen Committed by Android Git Automerger
Browse files

am 88f295d7: am 6a080bff: Merge "Accounting for widget padding in dips instead... 

am 88f295d7: am 6a080bff: Merge "Accounting for widget padding in dips instead of pixels" into jb-dev

* commit '88f295d7':
  Accounting for widget padding in dips instead of pixels
parents f60ae4e3 88f295d7

core/java/android/appwidget/AppWidgetHostView.java

+7 −6
Original line number Diff line number Diff line
@@ -232,14 +232,15 @@ public class AppWidgetHostView extends FrameLayout { 
        if (mInfo != null) {

            padding = getDefaultPaddingForWidget(mContext, mInfo.provider, padding);

        }

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



        int xPadding = padding.left + padding.right;

        int yPadding = padding.top + padding.bottom;

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

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



        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH, minWidth - xPadding);

        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, minHeight - yPadding);

        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH, maxWidth - xPadding);

        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT, maxHeight - yPadding);

        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH, minWidth - xPaddingDips);

        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, minHeight - yPaddingDips);

        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH, maxWidth - xPaddingDips);

        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT, maxHeight - yPaddingDips);

        updateAppWidgetOptions(options);

    }