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

Commit 841ce670 authored by Baligh Uddin's avatar Baligh Uddin
Browse files

Merge commit '81af21e6' into jb-mr1-dev

parents 1c743650 81af21e6

core/java/android/appwidget/AppWidgetHostView.java

+16 −8
Original line number Diff line number Diff line
@@ -244,14 +244,22 @@ public class AppWidgetHostView extends FrameLayout { 
     *

     * @param newOptions The bundle of options, in addition to the size information,

     *          can be null.

     * @param minWidth The minimum width that the widget will be displayed at.

     * @param minHeight The maximum height that the widget will be displayed at.

     * @param maxWidth The maximum width that the widget will be displayed at.

     * @param maxHeight The maximum height that the widget will be displayed at.

     * @param minWidth The minimum width in dips that the widget will be displayed at.

     * @param minHeight The maximum height in dips that the widget will be displayed at.

     * @param maxWidth The maximum width in dips that the widget will be displayed at.

     * @param maxHeight The maximum height in dips that the widget will be displayed at.

     *

     */

    public void updateAppWidgetSize(Bundle newOptions, int minWidth, int minHeight, int maxWidth,

            int maxHeight) {

        updateAppWidgetSize(newOptions, minWidth, minHeight, maxWidth, maxHeight, false);

    }



    /**

     * @hide

     */

    public void updateAppWidgetSize(Bundle newOptions, int minWidth, int minHeight, int maxWidth,

            int maxHeight, boolean ignorePadding) {

        if (newOptions == null) {

            newOptions = new Bundle();

        }
@@ -265,10 +273,10 @@ public class AppWidgetHostView extends FrameLayout { 
        int xPaddingDips = (int) ((padding.left + padding.right) / density);

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



        int newMinWidth = minWidth - xPaddingDips;

        int newMinHeight = minHeight - yPaddingDips; 

        int newMaxWidth = maxWidth - xPaddingDips;

        int newMaxHeight = maxHeight - yPaddingDips;

        int newMinWidth = minWidth - (ignorePadding ? 0 : xPaddingDips);

        int newMinHeight = minHeight - (ignorePadding ? 0 : yPaddingDips);

        int newMaxWidth = maxWidth - (ignorePadding ? 0 : xPaddingDips);

        int newMaxHeight = maxHeight - (ignorePadding ? 0 : yPaddingDips);



        AppWidgetManager widgetManager = AppWidgetManager.getInstance(mContext);

core/java/com/android/internal/widget/LockPatternUtils.java

+1 −5
Original line number Diff line number Diff line
@@ -1073,12 +1073,8 @@ public class LockPatternUtils { 
            }

            return appWidgetIds;

        }

        if (appWidgetIdString == null) {

            return new int[] { LockPatternUtils.ID_DEFAULT_STATUS_WIDGET };

        } else {

        return new int[0];

    }

    }



    private static String combineStrings(int[] list, String separator) {

        int listLength = list.length;

core/res/res/drawable-hdpi/kg_widget_delete_drop_target.png

0 → 100644
+1003 B
Loading image diff...

core/res/res/drawable-mdpi/kg_widget_delete_drop_target.png

0 → 100644
+802 B
Loading image diff...

core/res/res/drawable-xhdpi/kg_widget_delete_drop_target.png

0 → 100644
+1.36 KiB
Loading image diff...