diff options
| author | Adam Cohen <adamcohen@google.com> | 2012-09-28 18:35:41 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2012-09-28 19:33:05 -0700 |
| commit | 82ebe6f777902f00250efc3535ad11c2c6a74258 (patch) | |
| tree | 01a26f6ae08bdf15db0fe6bf462559d3f4d85490 | |
| parent | 42517367947047dd6cf7bd014e0c6d2db030af4e (diff) | |
| download | frameworks_base-82ebe6f777902f00250efc3535ad11c2c6a74258.zip frameworks_base-82ebe6f777902f00250efc3535ad11c2c6a74258.tar.gz frameworks_base-82ebe6f777902f00250efc3535ad11c2c6a74258.tar.bz2 | |
Getting rid of keyguard widget flag that isn't used
-> issue 7238875
Change-Id: Ifad890b4061784889f3fc7711a165452cf230fbd
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | core/java/android/appwidget/AppWidgetProviderInfo.java | 11 | ||||
| -rwxr-xr-x | core/res/res/values/attrs.xml | 3 |
3 files changed, 4 insertions, 13 deletions
diff --git a/api/current.txt b/api/current.txt index ea26c9a..add0a7d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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; diff --git a/core/java/android/appwidget/AppWidgetProviderInfo.java b/core/java/android/appwidget/AppWidgetProviderInfo.java index 5074480..8b62931 100644 --- a/core/java/android/appwidget/AppWidgetProviderInfo.java +++ b/core/java/android/appwidget/AppWidgetProviderInfo.java @@ -59,17 +59,11 @@ 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. diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 9759bdc..e97f8b5 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -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> |