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

Commit 18b317cf authored by Vladislav Kaznacheev's avatar Vladislav Kaznacheev Committed by Android (Google) Code Review
Browse files

Merge "Revert "Remove View.setTooltip/getTooltip""

parents 13c8c869 c56c7462

api/current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -43912,6 +43912,7 @@ package android.view { 
    method public java.lang.Object getTag(int);

    method public java.lang.Object getTag(int);

    method public int getTextAlignment();

    method public int getTextAlignment();

    method public int getTextDirection();

    method public int getTextDirection();

    method public final deprecated java.lang.CharSequence getTooltip();

    method public final java.lang.CharSequence getTooltipText();

    method public final java.lang.CharSequence getTooltipText();

    method public final int getTop();

    method public final int getTop();

    method protected float getTopFadingEdgeStrength();

    method protected float getTopFadingEdgeStrength();
@@ -44211,6 +44212,7 @@ package android.view { 
    method public void setTag(int, java.lang.Object);

    method public void setTag(int, java.lang.Object);

    method public void setTextAlignment(int);

    method public void setTextAlignment(int);

    method public void setTextDirection(int);

    method public void setTextDirection(int);

    method public final deprecated void setTooltip(java.lang.CharSequence);

    method public final void setTooltipText(java.lang.CharSequence);

    method public final void setTooltipText(java.lang.CharSequence);

    method public final void setTop(int);

    method public final void setTop(int);

    method public void setTouchDelegate(android.view.TouchDelegate);

    method public void setTouchDelegate(android.view.TouchDelegate);

api/system-current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -47270,6 +47270,7 @@ package android.view { 
    method public java.lang.Object getTag(int);

    method public java.lang.Object getTag(int);

    method public int getTextAlignment();

    method public int getTextAlignment();

    method public int getTextDirection();

    method public int getTextDirection();

    method public final deprecated java.lang.CharSequence getTooltip();

    method public final java.lang.CharSequence getTooltipText();

    method public final java.lang.CharSequence getTooltipText();

    method public final int getTop();

    method public final int getTop();

    method protected float getTopFadingEdgeStrength();

    method protected float getTopFadingEdgeStrength();
@@ -47569,6 +47570,7 @@ package android.view { 
    method public void setTag(int, java.lang.Object);

    method public void setTag(int, java.lang.Object);

    method public void setTextAlignment(int);

    method public void setTextAlignment(int);

    method public void setTextDirection(int);

    method public void setTextDirection(int);

    method public final deprecated void setTooltip(java.lang.CharSequence);

    method public final void setTooltipText(java.lang.CharSequence);

    method public final void setTooltipText(java.lang.CharSequence);

    method public final void setTop(int);

    method public final void setTop(int);

    method public void setTouchDelegate(android.view.TouchDelegate);

    method public void setTouchDelegate(android.view.TouchDelegate);

api/test-current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -44203,6 +44203,7 @@ package android.view { 
    method public java.lang.Object getTag(int);

    method public java.lang.Object getTag(int);

    method public int getTextAlignment();

    method public int getTextAlignment();

    method public int getTextDirection();

    method public int getTextDirection();

    method public final deprecated java.lang.CharSequence getTooltip();

    method public final java.lang.CharSequence getTooltipText();

    method public final java.lang.CharSequence getTooltipText();

    method public android.view.View getTooltipView();

    method public android.view.View getTooltipView();

    method public final int getTop();

    method public final int getTop();
@@ -44503,6 +44504,7 @@ package android.view { 
    method public void setTag(int, java.lang.Object);

    method public void setTag(int, java.lang.Object);

    method public void setTextAlignment(int);

    method public void setTextAlignment(int);

    method public void setTextDirection(int);

    method public void setTextDirection(int);

    method public final deprecated void setTooltip(java.lang.CharSequence);

    method public final void setTooltipText(java.lang.CharSequence);

    method public final void setTooltipText(java.lang.CharSequence);

    method public final void setTop(int);

    method public final void setTop(int);

    method public void setTouchDelegate(android.view.TouchDelegate);

    method public void setTouchDelegate(android.view.TouchDelegate);

core/java/android/view/View.java

+21 −0
Original line number Original line Diff line number Diff line
@@ -24616,6 +24616,16 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
        }

        }

    }

    }




















    /**














     * To be removed once the support library has stopped using it.














     *














     * @deprecated use {@link #setTooltipText} instead














     */














    @Deprecated














    public final void setTooltip(@Nullable CharSequence tooltipText) {














        setTooltipText(tooltipText);














    }
























    /**







    /**











     * Returns the view's tooltip text.







     * Returns the view's tooltip text.











     *







     *









@@ -24626,6 +24636,17 @@ public class View implements Drawable.Callback, KeyEvent.Callback,









        return mTooltipInfo != null ? mTooltipInfo.mTooltipText : null;







        return mTooltipInfo != null ? mTooltipInfo.mTooltipText : null;











    }







    }






























    /**














     * To be removed once the support library has stopped using it.














     *














     * @deprecated use {@link #getTooltipText} instead














     */














    @Deprecated














    @Nullable














    public final CharSequence getTooltip() {














        return getTooltipText();














    }
























    private boolean showTooltip(int x, int y, boolean fromLongClick) {







    private boolean showTooltip(int x, int y, boolean fromLongClick) {











        if (mAttachInfo == null) {







        if (mAttachInfo == null) {











            return false;







            return false;