Merge "Fix flag value for configuration_optional widget feature." into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
1dfe5cf462
@@ -8491,7 +8491,7 @@ package android.appwidget {
|
||||
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_SEARCHBOX = 4; // 0x4
|
||||
field public static final int WIDGET_FEATURE_CONFIGURATION_OPTIONAL = 3; // 0x3
|
||||
field public static final int WIDGET_FEATURE_CONFIGURATION_OPTIONAL = 4; // 0x4
|
||||
field public static final int WIDGET_FEATURE_HIDE_FROM_PICKER = 2; // 0x2
|
||||
field public static final int WIDGET_FEATURE_RECONFIGURABLE = 1; // 0x1
|
||||
field public int autoAdvanceViewId;
|
||||
|
||||
@@ -121,7 +121,7 @@ public class AppWidgetProviderInfo implements Parcelable {
|
||||
*
|
||||
* @see #widgetFeatures
|
||||
*/
|
||||
public static final int WIDGET_FEATURE_CONFIGURATION_OPTIONAL = 3;
|
||||
public static final int WIDGET_FEATURE_CONFIGURATION_OPTIONAL = 4;
|
||||
|
||||
/** @hide */
|
||||
@IntDef(flag = true, prefix = { "FLAG_" }, value = {
|
||||
|
||||
@@ -8173,7 +8173,7 @@
|
||||
<flag name="hide_from_picker" value="0x2" />
|
||||
<!-- The widget provides a default configuration. The host may decide not to launch
|
||||
the provided configuration activity. -->
|
||||
<flag name="configuration_optional" value="0x3" />
|
||||
<flag name="configuration_optional" value="0x4" />
|
||||
</attr>
|
||||
<!-- A resource identifier for a string containing a short description of the widget. -->
|
||||
<attr name="description" />
|
||||
|
||||
Reference in New Issue
Block a user