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

Commit b97a71e8 authored by Adam Cohen's avatar Adam Cohen Committed by Android (Google) Code Review
Browse files

Merge "Getting rid of keyguard widget flag that isn't used" into jb-mr1-dev

parents a6efc965 82ebe6f7

api/current.txt

+1 −2
Original line number Diff line number Diff line
@@ -4486,9 +4486,8 @@ package android.appwidget { 
    field public static final int RESIZE_VERTICAL = 2; // 0x2

    field public static final int WIDGET_CATEGORY_HOME_SCREEN = 1; // 0x1

    field public static final int WIDGET_CATEGORY_KEYGUARD = 2; // 0x2

    field public static final int WIDGET_FEATURES_CLOCK = 1; // 0x1

    field public static final int WIDGET_FEATURES_NONE = 0; // 0x0

    field public static final int WIDGET_FEATURES_STATUS = 2; // 0x2

    field public static final int WIDGET_FEATURES_STATUS = 1; // 0x1

    field public int autoAdvanceViewId;

    field public android.content.ComponentName configure;

    field public int icon;

core/java/android/appwidget/AppWidgetProviderInfo.java

+2 −9
Original line number Diff line number Diff line
@@ -58,18 +58,12 @@ public class AppWidgetProviderInfo implements Parcelable { 
     */

    public static final int WIDGET_FEATURES_NONE = 0;



    /**

     * Indicates that the widget displays the current time. The host may use this as a hint to not

     * display the time in other places.

     */

    public static final int WIDGET_FEATURES_CLOCK = 1;



    /**

     * Indicates that the widget is output only, ie. has nothing clickable. This may be enforced by

     * the host. Presently, this flag is used by the keyguard to indicate that it can be placed

     * in the first position.

     */

    public static final int WIDGET_FEATURES_STATUS = 2;

    public static final int WIDGET_FEATURES_STATUS = 1;



    /**

     * Identity of this AppWidget component.  This component should be a {@link
@@ -215,8 +209,7 @@ public class AppWidgetProviderInfo implements Parcelable { 


    /**

     * A field which specifies any special features that this widget supports. See

     * {@link #WIDGET_FEATURES_NONE}, {@link #WIDGET_FEATURES_CLOCK},

     * {@link #WIDGET_FEATURES_STATUS}.

     * {@link #WIDGET_FEATURES_NONE}, {@link #WIDGET_FEATURES_STATUS}.

     *

     * <p>This field corresponds to the <code>widgetFeatures</code> attribute in

     * the AppWidget meta-data file.

core/res/res/values/attrs.xml

+1 −2
Original line number Diff line number Diff line
@@ -5215,8 +5215,7 @@ 
             supports. Supports combined values using | operator. -->

        <attr name="widgetFeatures" format="integer">

            <flag name="none" value="0x0" />

            <flag name="clock" value="0x1" />

            <flag name="status" value="0x2" />

            <flag name="status" value="0x1" />

        </attr>

    </declare-styleable>