Fix docs build breakage in #TextView_letterSpacing

This patch removes the @hide annotations and public reference from the
new letterSpacing attribute, so the docs will build. It's still not an
ideal state because a test app can't find the attribute, but at least it
unbreaks the build.

Change-Id: I5425fbe3d63f7a759fabe43bd2136196c7112eed

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 30831cd..52618cc 100644 (file)
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -222,7 +222,6 @@ import static android.os.Build.VERSION_CODES.JELLY_BEAN_MR1;
  * @attr ref android.R.styleable#TextView_imeActionId
  * @attr ref android.R.styleable#TextView_editorExtras
  * @attr ref android.R.styleable#TextView_elegantTextHeight
- * @attr ref android.R.styleable#TextView_letterSpacing
  */
 @RemoteView
 public class TextView extends View implements ViewTreeObserver.OnPreDrawListener {

diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 0e87893..fedea4e 100644 (file)
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -3755,7 +3755,7 @@
         <attr name="shadowRadius" format="float" />
         <!-- Elegant text height, especially for less compacted complex script text. -->
         <attr name="elegantTextHeight" format="boolean" />
-        <!-- @hide Text letter-spacing. -->
+        <!-- Text letter-spacing. -->
         <attr name="letterSpacing" format="float" />
     </declare-styleable>
     <declare-styleable name="TextClock">
@@ -4050,7 +4050,7 @@
         <attr name="textAllCaps" />
         <!-- Elegant text height, especially for less compacted complex script text. -->
         <attr name="elegantTextHeight" />
-        <!-- @hide Text letter-spacing. -->
+        <!-- Text letter-spacing. -->
         <attr name="letterSpacing" />
     </declare-styleable>
     <declare-styleable name="TextViewAppearance">

diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index b1902dd..a6e85e9 100644 (file)
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2268,7 +2268,6 @@
   <public type="attr" name="checkMarkTintMode" />
   <public type="attr" name="popupTheme" />
   <public type="attr" name="toolbarStyle" />
-  <public type="attr" name="letterSpacing" />
 
   <public-padding type="dimen" name="l_resource_pad" end="0x01050010" />