Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e1430669: am b97a71e8: Merge "Getting rid of keyguard widget flag that isn\'t used" into jb-mr1-dev

Browse Source 
* commit 'e14306690096fc3a1ae78f411ba9a7b616224df7':
  Getting rid of keyguard widget flag that isn't used
This commit is contained in:
Adam Cohen
2012-10-01 10:15:17 -07:00
committed by Android Git Automerger
parent 7b9a263b50 e143066900
commit 2e16cf67c1
3 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/current.txt
View File

@@ -4486,9 +4486,8 @@ package android.appwidget {
field public static final int RESIZE_VERTICAL = 2; // 0x2 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_HOME_SCREEN = 1; // 0x1
field public static final int WIDGET_CATEGORY_KEYGUARD = 2; // 0x2 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_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 int autoAdvanceViewId;
field public android.content.ComponentName configure; field public android.content.ComponentName configure;
field public int icon; field public int icon;

11
core/java/android/appwidget/AppWidgetProviderInfo.java
View File

@@ -58,18 +58,12 @@ public class AppWidgetProviderInfo implements Parcelable {
*/ */
public static final int WIDGET_FEATURES_NONE = 0; 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 * 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 * the host. Presently, this flag is used by the keyguard to indicate that it can be placed
* in the first position. * 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 * 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 * A field which specifies any special features that this widget supports. See
* {@link #WIDGET_FEATURES_NONE}, {@link #WIDGET_FEATURES_CLOCK}, * {@link #WIDGET_FEATURES_NONE}, {@link #WIDGET_FEATURES_STATUS}.
* {@link #WIDGET_FEATURES_STATUS}.
* *
* <p>This field corresponds to the <code>widgetFeatures</code> attribute in * <p>This field corresponds to the <code>widgetFeatures</code> attribute in
* the AppWidget meta-data file. * the AppWidget meta-data file.

3
core/res/res/values/attrs.xml
View File

@@ -5215,8 +5215,7 @@
supports. Supports combined values using | operator. --> supports. Supports combined values using | operator. -->
<attr name="widgetFeatures" format="integer"> <attr name="widgetFeatures" format="integer">
<flag name="none" value="0x0" /> <flag name="none" value="0x0" />
<flag name="clock" value="0x1" /> <flag name="status" value="0x1" />
<flag name="status" value="0x2" />
</attr> </attr>
</declare-styleable> </declare-styleable>