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

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

Merge "Small change to AppWidgetProviderInfo public field name and docs"

parents 20ccb06a 9611f2ea

api/current.xml

+1 −1
Original line number Diff line number Diff line
@@ -39947,7 +39947,7 @@ 
 visibility="public"

>

</field>

<field name="resizableMode"

<field name="resizeMode"

 type="int"

 transient="false"

 volatile="false"

core/java/android/appwidget/AppWidgetProviderInfo.java

+9 −3
Original line number Diff line number Diff line
@@ -130,6 +130,9 @@ public class AppWidgetProviderInfo implements Parcelable { 


    /**

     * The view id of the AppWidget subview which should be auto-advanced by the widget's host.

     *

     * <p>This field corresponds to the <code>android:autoAdvanceViewId</code> attribute in

     * the AppWidget meta-data file.

     */

    public int autoAdvanceViewId;
@@ -146,8 +149,11 @@ public class AppWidgetProviderInfo implements Parcelable { 
     * The rules by which a widget can be resized. See {@link #RESIZE_NONE},

     * {@link #RESIZE_NONE}, {@link #RESIZE_HORIZONTAL},

     * {@link #RESIZE_VERTICAL}, {@link #RESIZE_BOTH}.

     *

     * <p>This field corresponds to the <code>android:resizeMode</code> attribute in

     * the AppWidget meta-data file.

     */

    public int resizableMode;

    public int resizeMode;



    public AppWidgetProviderInfo() {

    }
@@ -170,7 +176,7 @@ public class AppWidgetProviderInfo implements Parcelable { 
        this.icon = in.readInt();

        this.previewImage = in.readInt();

        this.autoAdvanceViewId = in.readInt();

        this.resizableMode = in.readInt();

        this.resizeMode = in.readInt();

    }



    public void writeToParcel(android.os.Parcel out, int flags) {
@@ -194,7 +200,7 @@ public class AppWidgetProviderInfo implements Parcelable { 
        out.writeInt(this.icon);

        out.writeInt(this.previewImage);

        out.writeInt(this.autoAdvanceViewId);

        out.writeInt(this.resizableMode);

        out.writeInt(this.resizeMode);

    }



    public int describeContents() {

services/java/com/android/server/AppWidgetService.java

+1 −1
Original line number Diff line number Diff line
@@ -1029,7 +1029,7 @@ class AppWidgetService extends IAppWidgetService.Stub 
            		com.android.internal.R.styleable.AppWidgetProviderInfo_previewImage, 0);

            info.autoAdvanceViewId = sa.getResourceId(

                    com.android.internal.R.styleable.AppWidgetProviderInfo_autoAdvanceViewId, -1);

            info.resizableMode = sa.getInt(

            info.resizeMode = sa.getInt(

                    com.android.internal.R.styleable.AppWidgetProviderInfo_resizeMode,

                    AppWidgetProviderInfo.RESIZE_NONE);