Merge "Make TextView.isSingleLine public"

api/current.txt

@@ -55599,6 +55599,7 @@ package android.widget {
     method public boolean isElegantTextHeight();
     method public boolean isFallbackLineSpacing();
     method public boolean isInputMethodTarget();
+    method public boolean isSingleLine();
     method public boolean isSuggestionsEnabled();
     method public boolean isTextSelectable();
     method public int length();

core/java/android/widget/TextView.java

@@ -6254,8 +6254,13 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
         return mHint;
     }
 
-    @UnsupportedAppUsage
-    boolean isSingleLine() {
+    /**
+     * Returns if the text is constrained to a single horizontally scrolling line ignoring new
+     * line characters instead of letting it wrap onto multiple lines.
+     *
+     * @attr ref android.R.styleable#TextView_singleLine
+     */
+    public boolean isSingleLine() {
         return mSingleLine;
     }