summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2011-02-28 15:24:56 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-02-28 15:24:56 -0800
commit6c2193a7e26c0794f45dfb60d2a0cf6ae776f390 (patch)
tree21488216b9187cd7060aa798ca7fd260af68847b /core
parent20ccb06a7c7fe368901c07b4acc70ad6513714cd (diff)
parent9611f2ea6c962c7eb05a2841d06656745f524097 (diff)
downloadframeworks_base-6c2193a7e26c0794f45dfb60d2a0cf6ae776f390.zip
frameworks_base-6c2193a7e26c0794f45dfb60d2a0cf6ae776f390.tar.gz
frameworks_base-6c2193a7e26c0794f45dfb60d2a0cf6ae776f390.tar.bz2
Merge "Small change to AppWidgetProviderInfo public field name and docs"
Diffstat (limited to 'core')
-rw-r--r--core/java/android/appwidget/AppWidgetProviderInfo.java12
1 files changed, 9 insertions, 3 deletions
diff --git a/core/java/android/appwidget/AppWidgetProviderInfo.java b/core/java/android/appwidget/AppWidgetProviderInfo.java
index 32c2397..b46802e 100644
--- a/core/java/android/appwidget/AppWidgetProviderInfo.java
+++ b/core/java/android/appwidget/AppWidgetProviderInfo.java
@@ -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() {