Update attr refs for unbundling
No longer relies on framework-private android.R.styleable fields.
Bug: 28124434
Change-Id: Ib2b11d5be949b7243964ada63fba7cd7ec25315b
diff --git a/v14/preference/src/android/support/v14/preference/MultiSelectListPreference.java b/v14/preference/src/android/support/v14/preference/MultiSelectListPreference.java
index 1695e92..82b3ad9 100644
--- a/v14/preference/src/android/support/v14/preference/MultiSelectListPreference.java
+++ b/v14/preference/src/android/support/v14/preference/MultiSelectListPreference.java
@@ -40,8 +40,8 @@
* This set will contain one or more values from the
* {@link #setEntryValues(CharSequence[])} array.
*
- * @attr ref android.R.styleable#MultiSelectListPreference_entries
- * @attr ref android.R.styleable#MultiSelectListPreference_entryValues
+ * @attr name android:entries
+ * @attr name android:entryValues
*/
public class MultiSelectListPreference extends DialogPreference {
private CharSequence[] mEntries;
diff --git a/v14/preference/src/android/support/v14/preference/SwitchPreference.java b/v14/preference/src/android/support/v14/preference/SwitchPreference.java
index 6e6b7f8..3f95d1a 100644
--- a/v14/preference/src/android/support/v14/preference/SwitchPreference.java
+++ b/v14/preference/src/android/support/v14/preference/SwitchPreference.java
@@ -34,11 +34,11 @@
* <p>
* This preference will store a boolean into the SharedPreferences.
*
- * @attr ref android.R.styleable#SwitchPreference_summaryOff
- * @attr ref android.R.styleable#SwitchPreference_summaryOn
- * @attr ref android.R.styleable#SwitchPreference_switchTextOff
- * @attr ref android.R.styleable#SwitchPreference_switchTextOn
- * @attr ref android.R.styleable#SwitchPreference_disableDependentsState
+ * @attr name android:summaryOff
+ * @attr name android:summaryOn
+ * @attr name android:switchTextOff
+ * @attr name android:switchTextOn
+ * @attr name android:disableDependentsState
*/
public class SwitchPreference extends TwoStatePreference {
private final Listener mListener = new Listener();
diff --git a/v4/java/android/support/v4/view/ViewCompat.java b/v4/java/android/support/v4/view/ViewCompat.java
index 27dd97f..4db02c4 100644
--- a/v4/java/android/support/v4/view/ViewCompat.java
+++ b/v4/java/android/support/v4/view/ViewCompat.java
@@ -2607,7 +2607,7 @@
* @param value The vertical position of this view relative to its top position,
* in pixels.
*
- * @attr ref android.R.styleable#View_translationY
+ * @attr name android:translationY
*/
public static void setTranslationY(View view, float value) {
IMPL.setTranslationY(view, value);
diff --git a/v4/java/android/support/v4/widget/CompoundButtonCompat.java b/v4/java/android/support/v4/widget/CompoundButtonCompat.java
index f4348ce..13ab974 100644
--- a/v4/java/android/support/v4/widget/CompoundButtonCompat.java
+++ b/v4/java/android/support/v4/widget/CompoundButtonCompat.java
@@ -156,7 +156,7 @@
/**
* @return the blending mode used to apply the tint to the button drawable
- * @attr ref android.R.styleable#CompoundButton_buttonTintMode
+ * @attr name android:buttonTintMode
* @see #setButtonTintMode(PorterDuff.Mode)
*/
@Nullable
diff --git a/v4/java/android/support/v4/widget/NestedScrollView.java b/v4/java/android/support/v4/widget/NestedScrollView.java
index 044c5d3..6f5dbbc 100644
--- a/v4/java/android/support/v4/widget/NestedScrollView.java
+++ b/v4/java/android/support/v4/widget/NestedScrollView.java
@@ -429,7 +429,7 @@
*
* @return True if the content fills the viewport, false otherwise.
*
- * @attr ref android.R.styleable#ScrollView_fillViewport
+ * @attr name android:fillViewport
*/
public boolean isFillViewport() {
return mFillViewport;
@@ -442,7 +442,7 @@
* @param fillViewport True to stretch the content's height to the viewport's
* boundaries, false otherwise.
*
- * @attr ref android.R.styleable#ScrollView_fillViewport
+ * @attr name android:fillViewport
*/
public void setFillViewport(boolean fillViewport) {
if (fillViewport != mFillViewport) {
diff --git a/v4/java/android/support/v4/widget/TextViewCompat.java b/v4/java/android/support/v4/widget/TextViewCompat.java
index 7af3087..510dde1 100644
--- a/v4/java/android/support/v4/widget/TextViewCompat.java
+++ b/v4/java/android/support/v4/widget/TextViewCompat.java
@@ -184,10 +184,10 @@
* {@link TextView#setCompoundDrawables} or related methods.
*
* @param textView The TextView against which to invoke the method.
- * @attr ref android.R.styleable#TextView_drawableStart
- * @attr ref android.R.styleable#TextView_drawableTop
- * @attr ref android.R.styleable#TextView_drawableEnd
- * @attr ref android.R.styleable#TextView_drawableBottom
+ * @attr name android:drawableStart
+ * @attr name android:drawableTop
+ * @attr name android:drawableEnd
+ * @attr name android:drawableBottom
*/
public static void setCompoundDrawablesRelative(@NonNull TextView textView,
@Nullable Drawable start, @Nullable Drawable top, @Nullable Drawable end,
@@ -204,10 +204,10 @@
* {@link TextView#setCompoundDrawables} or related methods.
*
* @param textView The TextView against which to invoke the method.
- * @attr ref android.R.styleable#TextView_drawableStart
- * @attr ref android.R.styleable#TextView_drawableTop
- * @attr ref android.R.styleable#TextView_drawableEnd
- * @attr ref android.R.styleable#TextView_drawableBottom
+ * @attr name android:drawableStart
+ * @attr name android:drawableTop
+ * @attr name android:drawableEnd
+ * @attr name android:drawableBottom
*/
public static void setCompoundDrawablesRelativeWithIntrinsicBounds(@NonNull TextView textView,
@Nullable Drawable start, @Nullable Drawable top, @Nullable Drawable end,
@@ -228,10 +228,10 @@
* @param top Resource identifier of the top Drawable.
* @param end Resource identifier of the end Drawable.
* @param bottom Resource identifier of the bottom Drawable.
- * @attr ref android.R.styleable#TextView_drawableStart
- * @attr ref android.R.styleable#TextView_drawableTop
- * @attr ref android.R.styleable#TextView_drawableEnd
- * @attr ref android.R.styleable#TextView_drawableBottom
+ * @attr name android:drawableStart
+ * @attr name android:drawableTop
+ * @attr name android:drawableEnd
+ * @attr name android:drawableBottom
*/
public static void setCompoundDrawablesRelativeWithIntrinsicBounds(@NonNull TextView textView,
@DrawableRes int start, @DrawableRes int top, @DrawableRes int end,
diff --git a/v7/appcompat/src/android/support/v7/widget/ViewStubCompat.java b/v7/appcompat/src/android/support/v7/widget/ViewStubCompat.java
index 11cd213..2b9c58e 100644
--- a/v7/appcompat/src/android/support/v7/widget/ViewStubCompat.java
+++ b/v7/appcompat/src/android/support/v7/widget/ViewStubCompat.java
@@ -71,7 +71,7 @@
* {@link #NO_ID} if the inflated view should keep its id.
*
* @see #setInflatedId(int)
- * @attr ref android.R.styleable#ViewStub_inflatedId
+ * @attr name android:inflatedId
*/
public int getInflatedId() {
return mInflatedId;
@@ -85,7 +85,7 @@
* {@link #NO_ID} if the inflated view should keep its id.
*
* @see #getInflatedId()
- * @attr ref android.R.styleable#ViewStub_inflatedId
+ * @attr name android:inflatedId
*/
public void setInflatedId(int inflatedId) {
mInflatedId = inflatedId;
@@ -101,7 +101,7 @@
* @see #setLayoutResource(int)
* @see #setVisibility(int)
* @see #inflate()
- * @attr ref android.R.styleable#ViewStub_layout
+ * @attr name android:layout
*/
public int getLayoutResource() {
return mLayoutResource;
@@ -117,7 +117,7 @@
* @see #getLayoutResource()
* @see #setVisibility(int)
* @see #inflate()
- * @attr ref android.R.styleable#ViewStub_layout
+ * @attr name android:layout
*/
public void setLayoutResource(int layoutResource) {
mLayoutResource = layoutResource;
diff --git a/v7/gridlayout/src/android/support/v7/widget/GridLayout.java b/v7/gridlayout/src/android/support/v7/widget/GridLayout.java
index a7c045d..bcc66f4 100644
--- a/v7/gridlayout/src/android/support/v7/widget/GridLayout.java
+++ b/v7/gridlayout/src/android/support/v7/widget/GridLayout.java
@@ -149,12 +149,12 @@
* See {@link GridLayout.LayoutParams} for a full description of the
* layout parameters used by GridLayout.
*
- * @attr ref android.R.styleable#GridLayout_orientation
- * @attr ref android.R.styleable#GridLayout_rowCount
- * @attr ref android.R.styleable#GridLayout_columnCount
- * @attr ref android.R.styleable#GridLayout_useDefaultMargins
- * @attr ref android.R.styleable#GridLayout_rowOrderPreserved
- * @attr ref android.R.styleable#GridLayout_columnOrderPreserved
+ * @attr name android:orientation
+ * @attr name android:rowCount
+ * @attr name android:columnCount
+ * @attr name android:useDefaultMargins
+ * @attr name android:rowOrderPreserved
+ * @attr name android:columnOrderPreserved
*/
public class GridLayout extends ViewGroup {
@@ -301,7 +301,7 @@
*
* @see #setOrientation(int)
*
- * @attr ref android.R.styleable#GridLayout_orientation
+ * @attr name android:orientation
*/
public int getOrientation() {
return mOrientation;
@@ -341,7 +341,7 @@
*
* @see #getOrientation()
*
- * @attr ref android.R.styleable#GridLayout_orientation
+ * @attr name android:orientation
*/
public void setOrientation(int orientation) {
if (this.mOrientation != orientation) {
@@ -361,7 +361,7 @@
* @see #setRowCount(int)
* @see LayoutParams#rowSpec
*
- * @attr ref android.R.styleable#GridLayout_rowCount
+ * @attr name android:rowCount
*/
public int getRowCount() {
return mVerticalAxis.getCount();
@@ -376,7 +376,7 @@
* @see #getRowCount()
* @see LayoutParams#rowSpec
*
- * @attr ref android.R.styleable#GridLayout_rowCount
+ * @attr name android:rowCount
*/
public void setRowCount(int rowCount) {
mVerticalAxis.setCount(rowCount);
@@ -394,7 +394,7 @@
* @see #setColumnCount(int)
* @see LayoutParams#columnSpec
*
- * @attr ref android.R.styleable#GridLayout_columnCount
+ * @attr name android:columnCount
*/
public int getColumnCount() {
return mHorizontalAxis.getCount();
@@ -409,7 +409,7 @@
* @see #getColumnCount()
* @see LayoutParams#columnSpec
*
- * @attr ref android.R.styleable#GridLayout_columnCount
+ * @attr name android:columnCount
*/
public void setColumnCount(int columnCount) {
mHorizontalAxis.setCount(columnCount);
@@ -425,7 +425,7 @@
*
* @see #setUseDefaultMargins(boolean)
*
- * @attr ref android.R.styleable#GridLayout_useDefaultMargins
+ * @attr name android:useDefaultMargins
*/
public boolean getUseDefaultMargins() {
return mUseDefaultMargins;
@@ -455,7 +455,7 @@
* @see MarginLayoutParams#rightMargin
* @see MarginLayoutParams#bottomMargin
*
- * @attr ref android.R.styleable#GridLayout_useDefaultMargins
+ * @attr name android:useDefaultMargins
*/
public void setUseDefaultMargins(boolean useDefaultMargins) {
this.mUseDefaultMargins = useDefaultMargins;
@@ -472,7 +472,7 @@
*
* @see #setAlignmentMode(int)
*
- * @attr ref android.R.styleable#GridLayout_alignmentMode
+ * @attr name android:alignmentMode
*/
public int getAlignmentMode() {
return mAlignmentMode;
@@ -491,7 +491,7 @@
*
* @see #getAlignmentMode()
*
- * @attr ref android.R.styleable#GridLayout_alignmentMode
+ * @attr name android:alignmentMode
*/
public void setAlignmentMode(int alignmentMode) {
this.mAlignmentMode = alignmentMode;
@@ -506,7 +506,7 @@
*
* @see #setRowOrderPreserved(boolean)
*
- * @attr ref android.R.styleable#GridLayout_rowOrderPreserved
+ * @attr name android:rowOrderPreserved
*/
public boolean isRowOrderPreserved() {
return mVerticalAxis.isOrderPreserved();
@@ -526,7 +526,7 @@
*
* @see #isRowOrderPreserved()
*
- * @attr ref android.R.styleable#GridLayout_rowOrderPreserved
+ * @attr name android:rowOrderPreserved
*/
public void setRowOrderPreserved(boolean rowOrderPreserved) {
mVerticalAxis.setOrderPreserved(rowOrderPreserved);
@@ -542,7 +542,7 @@
*
* @see #setColumnOrderPreserved(boolean)
*
- * @attr ref android.R.styleable#GridLayout_columnOrderPreserved
+ * @attr name android:columnOrderPreserved
*/
public boolean isColumnOrderPreserved() {
return mHorizontalAxis.isOrderPreserved();
@@ -562,7 +562,7 @@
*
* @see #isColumnOrderPreserved()
*
- * @attr ref android.R.styleable#GridLayout_columnOrderPreserved
+ * @attr name android:columnOrderPreserved
*/
public void setColumnOrderPreserved(boolean columnOrderPreserved) {
mHorizontalAxis.setOrderPreserved(columnOrderPreserved);
@@ -1865,13 +1865,13 @@
* See {@link GridLayout} for a more complete description of the conventions
* used by GridLayout in the interpretation of the properties of this class.
*
- * @attr ref android.R.styleable#GridLayout_Layout_layout_row
- * @attr ref android.R.styleable#GridLayout_Layout_layout_rowSpan
- * @attr ref android.R.styleable#GridLayout_Layout_layout_rowWeight
- * @attr ref android.R.styleable#GridLayout_Layout_layout_column
- * @attr ref android.R.styleable#GridLayout_Layout_layout_columnSpan
- * @attr ref android.R.styleable#GridLayout_Layout_layout_columnWeight
- * @attr ref android.R.styleable#GridLayout_Layout_layout_gravity
+ * @attr name android:row
+ * @attr name android:rowSpan
+ * @attr name android:rowWeight
+ * @attr name android:column
+ * @attr name android:columnSpan
+ * @attr name android:columnWeight
+ * @attr name android:gravity
*/
public static class LayoutParams extends MarginLayoutParams {
@@ -2060,7 +2060,7 @@
*
* @param gravity the new gravity value
*
- * @attr ref android.R.styleable#GridLayout_Layout_layout_gravity
+ * @attr name android:gravity
*/
public void setGravity(int gravity) {
rowSpec = rowSpec.copyWriteAlignment(getAlignment(gravity, false));
diff --git a/v7/preference/src/android/support/v7/preference/CheckBoxPreference.java b/v7/preference/src/android/support/v7/preference/CheckBoxPreference.java
index 8ef625b..b6dad92 100644
--- a/v7/preference/src/android/support/v7/preference/CheckBoxPreference.java
+++ b/v7/preference/src/android/support/v7/preference/CheckBoxPreference.java
@@ -31,9 +31,9 @@
* <p>
* This preference will store a boolean into the SharedPreferences.
*
- * @attr ref android.R.styleable#CheckBoxPreference_summaryOff
- * @attr ref android.R.styleable#CheckBoxPreference_summaryOn
- * @attr ref android.R.styleable#CheckBoxPreference_disableDependentsState
+ * @attr name android:summaryOff
+ * @attr name android:summaryOn
+ * @attr name android:disableDependentsState
*/
public class CheckBoxPreference extends TwoStatePreference {
private final Listener mListener = new Listener();
diff --git a/v7/preference/src/android/support/v7/preference/DialogPreference.java b/v7/preference/src/android/support/v7/preference/DialogPreference.java
index 158accb..aa7efee 100644
--- a/v7/preference/src/android/support/v7/preference/DialogPreference.java
+++ b/v7/preference/src/android/support/v7/preference/DialogPreference.java
@@ -29,12 +29,12 @@
* dialog-based. These preferences will, when clicked, open a dialog showing the
* actual preference controls.
*
- * @attr ref android.R.styleable#DialogPreference_dialogTitle
- * @attr ref android.R.styleable#DialogPreference_dialogMessage
- * @attr ref android.R.styleable#DialogPreference_dialogIcon
- * @attr ref android.R.styleable#DialogPreference_dialogLayout
- * @attr ref android.R.styleable#DialogPreference_positiveButtonText
- * @attr ref android.R.styleable#DialogPreference_negativeButtonText
+ * @attr name android:dialogTitle
+ * @attr name android:dialogMessage
+ * @attr name android:dialogIcon
+ * @attr name android:dialogLayout
+ * @attr name android:positiveButtonText
+ * @attr name android:negativeButtonText
*/
public abstract class DialogPreference extends Preference {
diff --git a/v7/preference/src/android/support/v7/preference/ListPreference.java b/v7/preference/src/android/support/v7/preference/ListPreference.java
index 4507b26..2b433e5 100644
--- a/v7/preference/src/android/support/v7/preference/ListPreference.java
+++ b/v7/preference/src/android/support/v7/preference/ListPreference.java
@@ -33,8 +33,8 @@
* This preference will store a string into the SharedPreferences. This string will be the value
* from the {@link #setEntryValues(CharSequence[])} array.
*
- * @attr ref android.R.styleable#ListPreference_entries
- * @attr ref android.R.styleable#ListPreference_entryValues
+ * @attr name android:entries
+ * @attr name android:entryValues
*/
public class ListPreference extends DialogPreference {
private CharSequence[] mEntries;
diff --git a/v7/preference/src/android/support/v7/preference/Preference.java b/v7/preference/src/android/support/v7/preference/Preference.java
index d9621a2..31699fe 100644
--- a/v7/preference/src/android/support/v7/preference/Preference.java
+++ b/v7/preference/src/android/support/v7/preference/Preference.java
@@ -61,20 +61,20 @@
* guide.</p>
* </div>
*
- * @attr ref android.R.styleable#Preference_icon
- * @attr ref android.R.styleable#Preference_key
- * @attr ref android.R.styleable#Preference_title
- * @attr ref android.R.styleable#Preference_summary
- * @attr ref android.R.styleable#Preference_order
- * @attr ref android.R.styleable#Preference_fragment
- * @attr ref android.R.styleable#Preference_layout
- * @attr ref android.R.styleable#Preference_widgetLayout
- * @attr ref android.R.styleable#Preference_enabled
- * @attr ref android.R.styleable#Preference_selectable
- * @attr ref android.R.styleable#Preference_dependency
- * @attr ref android.R.styleable#Preference_persistent
- * @attr ref android.R.styleable#Preference_defaultValue
- * @attr ref android.R.styleable#Preference_shouldDisableView
+ * @attr name android:icon
+ * @attr name android:key
+ * @attr name android:title
+ * @attr name android:summary
+ * @attr name android:order
+ * @attr name android:fragment
+ * @attr name android:layout
+ * @attr name android:widgetLayout
+ * @attr name android:enabled
+ * @attr name android:selectable
+ * @attr name android:dependency
+ * @attr name android:persistent
+ * @attr name android:defaultValue
+ * @attr name android:shouldDisableView
*/
public class Preference implements Comparable<Preference> {
/**
diff --git a/v7/preference/src/android/support/v7/preference/PreferenceGroup.java b/v7/preference/src/android/support/v7/preference/PreferenceGroup.java
index 7ef7d0d1..4768e01 100644
--- a/v7/preference/src/android/support/v7/preference/PreferenceGroup.java
+++ b/v7/preference/src/android/support/v7/preference/PreferenceGroup.java
@@ -41,7 +41,7 @@
* guide.</p>
* </div>
*
- * @attr ref android.R.styleable#PreferenceGroup_orderingFromXml
+ * @attr name android:orderingFromXml
*/
public abstract class PreferenceGroup extends Preference {
/**
diff --git a/v7/preference/src/android/support/v7/preference/SwitchPreferenceCompat.java b/v7/preference/src/android/support/v7/preference/SwitchPreferenceCompat.java
index 295d835..ce41a25 100644
--- a/v7/preference/src/android/support/v7/preference/SwitchPreferenceCompat.java
+++ b/v7/preference/src/android/support/v7/preference/SwitchPreferenceCompat.java
@@ -31,11 +31,11 @@
* <p>
* This preference will store a boolean into the SharedPreferences.
*
-* @attr ref android.R.styleable#SwitchPreference_summaryOff
-* @attr ref android.R.styleable#SwitchPreference_summaryOn
-* @attr ref android.R.styleable#SwitchPreference_switchTextOff
-* @attr ref android.R.styleable#SwitchPreference_switchTextOn
-* @attr ref android.R.styleable#SwitchPreference_disableDependentsState
+* @attr name android:summaryOff
+* @attr name android:summaryOn
+* @attr name android:switchTextOff
+* @attr name android:switchTextOn
+* @attr name android:disableDependentsState
*/
public class SwitchPreferenceCompat extends TwoStatePreference {
private final Listener mListener = new Listener();