summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2012-10-31 16:09:28 -0700
committerAdam Cohen <adamcohen@google.com>2012-10-31 17:42:26 -0700
commit8f697d858098ec1e7bb7f84abcd15ba49e3e8927 (patch)
treef5866e8aef667231b20c18b34b004cbd9f2c0162
parentc8dc8eb3275a6d05e27824f322796e97e5e50e2f (diff)
downloadframeworks_base-8f697d858098ec1e7bb7f84abcd15ba49e3e8927.zip
frameworks_base-8f697d858098ec1e7bb7f84abcd15ba49e3e8927.tar.gz
frameworks_base-8f697d858098ec1e7bb7f84abcd15ba49e3e8927.tar.bz2
Stripping dead API related to keyguard widgets
Change-Id: Ieb6c57ef736712b3266de08027f9626104cdf1bb
-rw-r--r--api/17.txt4
-rw-r--r--api/current.txt4
-rw-r--r--core/java/android/appwidget/AppWidgetProviderInfo.java24
-rwxr-xr-xcore/res/res/values/attrs.xml6
-rw-r--r--core/res/res/values/public.xml1
-rw-r--r--services/java/com/android/server/AppWidgetServiceImpl.java4
6 files changed, 0 insertions, 43 deletions
diff --git a/api/17.txt b/api/17.txt
index e26d8f0..45a3cc1 100644
--- a/api/17.txt
+++ b/api/17.txt
@@ -1142,7 +1142,6 @@ package android {
field public static final int weekSeparatorLineColor = 16843590; // 0x1010346
field public static final int weightSum = 16843048; // 0x1010128
field public static final int widgetCategory = 16843716; // 0x10103c4
- field public static final int widgetFeatures = 16843715; // 0x10103c3
field public static final int widgetLayout = 16843243; // 0x10101eb
field public static final int width = 16843097; // 0x1010159
field public static final int windowActionBar = 16843469; // 0x10102cd
@@ -4494,8 +4493,6 @@ 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_NONE = 0; // 0x0
- field public static final int WIDGET_FEATURES_STATUS = 1; // 0x1
field public int autoAdvanceViewId;
field public android.content.ComponentName configure;
field public int icon;
@@ -4511,7 +4508,6 @@ package android.appwidget {
field public int resizeMode;
field public int updatePeriodMillis;
field public int widgetCategory;
- field public int widgetFeatures;
}
}
diff --git a/api/current.txt b/api/current.txt
index e26d8f0..45a3cc1 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -1142,7 +1142,6 @@ package android {
field public static final int weekSeparatorLineColor = 16843590; // 0x1010346
field public static final int weightSum = 16843048; // 0x1010128
field public static final int widgetCategory = 16843716; // 0x10103c4
- field public static final int widgetFeatures = 16843715; // 0x10103c3
field public static final int widgetLayout = 16843243; // 0x10101eb
field public static final int width = 16843097; // 0x1010159
field public static final int windowActionBar = 16843469; // 0x10102cd
@@ -4494,8 +4493,6 @@ 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_NONE = 0; // 0x0
- field public static final int WIDGET_FEATURES_STATUS = 1; // 0x1
field public int autoAdvanceViewId;
field public android.content.ComponentName configure;
field public int icon;
@@ -4511,7 +4508,6 @@ package android.appwidget {
field public int resizeMode;
field public int updatePeriodMillis;
field public int widgetCategory;
- field public int widgetFeatures;
}
}
diff --git a/core/java/android/appwidget/AppWidgetProviderInfo.java b/core/java/android/appwidget/AppWidgetProviderInfo.java
index 8b62931..6bf12e6 100644
--- a/core/java/android/appwidget/AppWidgetProviderInfo.java
+++ b/core/java/android/appwidget/AppWidgetProviderInfo.java
@@ -54,18 +54,6 @@ public class AppWidgetProviderInfo implements Parcelable {
public static final int WIDGET_CATEGORY_KEYGUARD = 2;
/**
- * Indicates that the widget supports no special features.
- */
- public static final int WIDGET_FEATURES_NONE = 0;
-
- /**
- * 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 = 1;
-
- /**
* Identity of this AppWidget component. This component should be a {@link
* android.content.BroadcastReceiver}, and it will be sent the AppWidget intents
* {@link android.appwidget as described in the AppWidget package documentation}.
@@ -207,15 +195,6 @@ public class AppWidgetProviderInfo implements Parcelable {
*/
public int widgetCategory;
- /**
- * A field which specifies any special features that this widget supports. See
- * {@link #WIDGET_FEATURES_NONE}, {@link #WIDGET_FEATURES_STATUS}.
- *
- * <p>This field corresponds to the <code>widgetFeatures</code> attribute in
- * the AppWidget meta-data file.
- */
- public int widgetFeatures;
-
public AppWidgetProviderInfo() {
}
@@ -242,7 +221,6 @@ public class AppWidgetProviderInfo implements Parcelable {
this.autoAdvanceViewId = in.readInt();
this.resizeMode = in.readInt();
this.widgetCategory = in.readInt();
- this.widgetFeatures = in.readInt();
}
public void writeToParcel(android.os.Parcel out, int flags) {
@@ -271,7 +249,6 @@ public class AppWidgetProviderInfo implements Parcelable {
out.writeInt(this.autoAdvanceViewId);
out.writeInt(this.resizeMode);
out.writeInt(this.widgetCategory);
- out.writeInt(this.widgetFeatures);
}
@Override
@@ -292,7 +269,6 @@ public class AppWidgetProviderInfo implements Parcelable {
that.autoAdvanceViewId = this.autoAdvanceViewId;
that.resizeMode = this.resizeMode;
that.widgetCategory = this.widgetCategory;
- that.widgetFeatures = this.widgetFeatures;
return that;
}
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 627099c..507dfdf 100755
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -5213,12 +5213,6 @@
<flag name="home_screen" value="0x1" />
<flag name="keyguard" value="0x2" />
</attr>
- <!-- Optional parameter which indicates any feature(s) that this widget
- supports. Supports combined values using | operator. -->
- <attr name="widgetFeatures" format="integer">
- <flag name="none" value="0x0" />
- <flag name="status" value="0x1" />
- </attr>
</declare-styleable>
<!-- =============================== -->
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index d7a480b..62ef8b6 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2013,7 +2013,6 @@
<public type="attr" name="presentationTheme" id="0x010103c0" />
<public type="attr" name="subtypeId" id="0x010103c1" />
<public type="attr" name="initialKeyguardLayout" id="0x010103c2" />
- <public type="attr" name="widgetFeatures" id="0x010103c3" />
<public type="attr" name="widgetCategory" id="0x010103c4" />
<public type="attr" name="permissionGroupFlags" id="0x010103c5" />
<public type="attr" name="labelFor" id="0x010103c6" />
diff --git a/services/java/com/android/server/AppWidgetServiceImpl.java b/services/java/com/android/server/AppWidgetServiceImpl.java
index 6a313a0..d0dd9cf 100644
--- a/services/java/com/android/server/AppWidgetServiceImpl.java
+++ b/services/java/com/android/server/AppWidgetServiceImpl.java
@@ -326,7 +326,6 @@ class AppWidgetServiceImpl {
pw.print(" resizeMode=");
pw.print(info.resizeMode);
pw.print(info.widgetCategory);
- pw.print(info.widgetFeatures);
pw.print(" autoAdvanceViewId=");
pw.print(info.autoAdvanceViewId);
pw.print(" initialLayout=#");
@@ -1412,9 +1411,6 @@ class AppWidgetServiceImpl {
info.widgetCategory = sa.getInt(
com.android.internal.R.styleable.AppWidgetProviderInfo_widgetCategory,
AppWidgetProviderInfo.WIDGET_CATEGORY_HOME_SCREEN);
- info.widgetFeatures = sa.getInt(
- com.android.internal.R.styleable.AppWidgetProviderInfo_widgetFeatures,
- AppWidgetProviderInfo.WIDGET_FEATURES_NONE);
sa.recycle();
} catch (Exception e) {