diff --git a/api/current.txt b/api/current.txt index bdeb5b4b31867..083262a3340e8 100644 --- a/api/current.txt +++ b/api/current.txt @@ -6480,7 +6480,6 @@ package android.content { field public static final android.os.Parcelable.Creator CREATOR; field public static final int TYPE_BOOLEAN = 1; // 0x1 field public static final int TYPE_CHOICE = 2; // 0x2 - field public static final int TYPE_CHOICE_LEVEL = 3; // 0x3 field public static final int TYPE_MULTI_SELECT = 4; // 0x4 field public static final int TYPE_NULL = 0; // 0x0 } diff --git a/core/java/android/content/RestrictionEntry.java b/core/java/android/content/RestrictionEntry.java index af903858dc7cb..217cf763b9a15 100644 --- a/core/java/android/content/RestrictionEntry.java +++ b/core/java/android/content/RestrictionEntry.java @@ -60,6 +60,7 @@ public class RestrictionEntry implements Parcelable { * and the corresponding values, respectively. * The presentation could imply that values in lower array indices are included when a * particular value is chosen. + * @hide */ public static final int TYPE_CHOICE_LEVEL = 3; @@ -102,7 +103,7 @@ public class RestrictionEntry implements Parcelable { private String[] currentValues; /** - * Constructor for {@link #TYPE_CHOICE} and {@link #TYPE_CHOICE_LEVEL} types. + * Constructor for {@link #TYPE_CHOICE} type. * @param key the unique key for this restriction * @param selectedString the current value */ @@ -206,7 +207,7 @@ public class RestrictionEntry implements Parcelable { * shown to the user. Values will be chosen from this list as the user's selection and the * selected values can be retrieved by a call to {@link #getAllSelectedStrings()}, or * {@link #getSelectedString()}, depending on whether it is a multi-select type or choice type. - * This method is not relevant for types other than {@link #TYPE_CHOICE_LEVEL}, + * This method is not relevant for types other than * {@link #TYPE_CHOICE}, and {@link #TYPE_MULTI_SELECT}. * @param choiceValues an array of Strings which will be the selected values for the user's * selections. @@ -241,7 +242,7 @@ public class RestrictionEntry implements Parcelable { * user selects one or more of these choices, the corresponding value from the possible values * are stored as the selected strings. The size of this array must match the size of the array * set in {@link #setChoiceValues(String[])}. This method is not relevant for types other - * than {@link #TYPE_CHOICE_LEVEL}, {@link #TYPE_CHOICE}, and {@link #TYPE_MULTI_SELECT}. + * than {@link #TYPE_CHOICE}, and {@link #TYPE_MULTI_SELECT}. * @param choiceEntries the list of user-visible choices. * @see #setChoiceValues(String[]) */