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

Commit 940e92e1 authored by Baligh Uddin's avatar Baligh Uddin Committed by Android Git Automerger
Browse files

am 841ce670: Merge commit \'81af21e6\' into jb-mr1-dev 

* commit '841ce670': (26 commits)
  hide the correct text, and more text, on bounce
  Improve PIN key layouts.
  Obscure speech for PIN password keys when no headset plugged in.
  Initial changes to allow dropping on delete target to remove widget.
  hide multiuser selector when IME is up.
  Block swipe up gesture if challenge non-interactive.
  Properly disable challenge handle.
  Disable disable back if using an alternate back icon.
  Disable security handle when swiping into camera widget.
  Import translations. DO NOT MERGE
  Fix small issue with previous CL
  Widget size policy, size callbacks
  Don't show security method until we actually return from the camera
  Fix whitespace problem and sync with prototype.
  PUK support.
  Fix build.
  SIM PIN support.
  Use clock's widget as the default keyguard widget
  Add configurable em-dash separator for all concatenated keyguard strings
  Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991)
  ...
parents 35d0dea3 841ce670

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...