Fix lint warnings in TextViewCompat.
Instead of creating our own constants for AUTO_SIZE_TEXT_TYPE_NONE
and AUTO_SIZE_TEXT_TYPE_UNIFORM use framework values instead. This
way lint can know that we are passing around the right values.
Test: ./gradlew lintRelease
Bug: 64018921
Change-Id: Ia99534a775327da378807ee32e946f07eba9fc74
diff --git a/compat/java/android/support/v4/widget/TextViewCompat.java b/compat/java/android/support/v4/widget/TextViewCompat.java
index d7ca21e..5654c3e 100644
--- a/compat/java/android/support/v4/widget/TextViewCompat.java
+++ b/compat/java/android/support/v4/widget/TextViewCompat.java
@@ -44,13 +44,13 @@
/**
* The TextView does not auto-size text (default).
*/
- public static final int AUTO_SIZE_TEXT_TYPE_NONE = 0;
+ public static final int AUTO_SIZE_TEXT_TYPE_NONE = TextView.AUTO_SIZE_TEXT_TYPE_NONE;
/**
* The TextView scales text size both horizontally and vertically to fit within the
* container.
*/
- public static final int AUTO_SIZE_TEXT_TYPE_UNIFORM = 1;
+ public static final int AUTO_SIZE_TEXT_TYPE_UNIFORM = TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM;
/** @hide */
@RestrictTo(LIBRARY_GROUP)
diff --git a/v7/appcompat/lint-baseline.xml b/v7/appcompat/lint-baseline.xml
index febede9..3ae048f 100644
--- a/v7/appcompat/lint-baseline.xml
+++ b/v7/appcompat/lint-baseline.xml
@@ -3,72 +3,6 @@
<issue
id="WrongConstant"
- message="Must be one of: TextView.AUTO_SIZE_TEXT_TYPE_NONE, TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM"
- errorLine1=" ? TextViewCompat.AUTO_SIZE_TEXT_TYPE_UNIFORM"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/android/support/v7/widget/AppCompatButton.java"
- line="274"
- column="23"/>
- </issue>
-
- <issue
- id="WrongConstant"
- message="Must be one of: TextView.AUTO_SIZE_TEXT_TYPE_NONE, TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM"
- errorLine1=" : TextViewCompat.AUTO_SIZE_TEXT_TYPE_NONE;"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/android/support/v7/widget/AppCompatButton.java"
- line="275"
- column="23"/>
- </issue>
-
- <issue
- id="WrongConstant"
- message="Must be one of: TextView.AUTO_SIZE_TEXT_TYPE_NONE, TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM"
- errorLine1=" return TextViewCompat.AUTO_SIZE_TEXT_TYPE_NONE;"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/android/support/v7/widget/AppCompatButton.java"
- line="281"
- column="16"/>
- </issue>
-
- <issue
- id="WrongConstant"
- message="Must be one of: TextView.AUTO_SIZE_TEXT_TYPE_NONE, TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM"
- errorLine1=" ? TextViewCompat.AUTO_SIZE_TEXT_TYPE_UNIFORM"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/android/support/v7/widget/AppCompatTextView.java"
- line="280"
- column="23"/>
- </issue>
-
- <issue
- id="WrongConstant"
- message="Must be one of: TextView.AUTO_SIZE_TEXT_TYPE_NONE, TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM"
- errorLine1=" : TextViewCompat.AUTO_SIZE_TEXT_TYPE_NONE;"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/android/support/v7/widget/AppCompatTextView.java"
- line="281"
- column="23"/>
- </issue>
-
- <issue
- id="WrongConstant"
- message="Must be one of: TextView.AUTO_SIZE_TEXT_TYPE_NONE, TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM"
- errorLine1=" return TextViewCompat.AUTO_SIZE_TEXT_TYPE_NONE;"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/android/support/v7/widget/AppCompatTextView.java"
- line="287"
- column="16"/>
- </issue>
-
- <issue
- id="WrongConstant"
message="Must be one or more of: ActionBar.DISPLAY_USE_LOGO, ActionBar.DISPLAY_SHOW_HOME, ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_SHOW_TITLE, ActionBar.DISPLAY_SHOW_CUSTOM"
errorLine1=" setDisplayOptions(options, 0xffffffff);"
errorLine2=" ~~~~~~~~~~">