Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5f83d0c authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Add TextView#set/getShowSoftInputOnFocus"

parents 0612d3df 206c6e85

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -37764,6 +37764,7 @@ package android.widget { 
    method public float getShadowDx();

    method public float getShadowDy();

    method public float getShadowRadius();

    method public final boolean getShowSoftInputOnFocus();

    method public java.lang.CharSequence getText();

    method public static int getTextColor(android.content.Context, android.content.res.TypedArray, int);

    method public final android.content.res.ColorStateList getTextColors();
@@ -37857,6 +37858,7 @@ package android.widget { 
    method public void setScroller(android.widget.Scroller);

    method public void setSelectAllOnFocus(boolean);

    method public void setShadowLayer(float, float, float, int);

    method public final void setShowSoftInputOnFocus(boolean);

    method public void setSingleLine();

    method public void setSingleLine(boolean);

    method public final void setSpannableFactory(android.text.Spannable.Factory);

core/java/android/widget/TextView.java

+0 −2
Original line number Diff line number Diff line
@@ -2727,7 +2727,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
    /**

     * Sets whether the soft input method will be made visible when this

     * TextView gets focused. The default is true.

     * @hide

     */

    @android.view.RemotableViewMethod

    public final void setShowSoftInputOnFocus(boolean show) {
@@ -2738,7 +2737,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
    /**

     * Returns whether the soft input method will be made visible when this

     * TextView gets focused. The default is true.

     * @hide

     */

    public final boolean getShowSoftInputOnFocus() {

        // When there is no Editor, return default true value