diff options
| author | Ed Heyl <edheyl@google.com> | 2012-11-01 18:06:35 -0700 |
|---|---|---|
| committer | Ed Heyl <edheyl@google.com> | 2012-11-01 18:06:35 -0700 |
| commit | 39912f7fcd5bfc4943bac1746c3ff2a9f1d93043 (patch) | |
| tree | d001f07c9464fa4e6d008ff7a6f6b6ee2ed234c0 /api | |
| parent | 62831a7bd02868316ad1a16dcf13c98896fdbbdc (diff) | |
| parent | 87bb019e57eddcedd4aeca180ac36bdf1d42064a (diff) | |
| download | frameworks_base-39912f7fcd5bfc4943bac1746c3ff2a9f1d93043.zip frameworks_base-39912f7fcd5bfc4943bac1746c3ff2a9f1d93043.tar.gz frameworks_base-39912f7fcd5bfc4943bac1746c3ff2a9f1d93043.tar.bz2 | |
Merge commit '87bb019e57eddcedd4aeca180ac36bdf1d42064a' into jb-mr1-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/17.txt | 4 | ||||
| -rw-r--r-- | api/current.txt | 4 |
2 files changed, 0 insertions, 8 deletions
@@ -1145,7 +1145,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 @@ -4497,8 +4496,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; @@ -4514,7 +4511,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 58f485f..6b893d5 100644 --- a/api/current.txt +++ b/api/current.txt @@ -1145,7 +1145,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 @@ -4497,8 +4496,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; @@ -4514,7 +4511,6 @@ package android.appwidget { field public int resizeMode; field public int updatePeriodMillis; field public int widgetCategory; - field public int widgetFeatures; } } |