Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-01-26 07:39:48 +00:00
committed by Android (Google) Code Review
parent bcf3b70371 4db5dedb76
commit 35089c466e
4 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -44087,7 +44087,6 @@ package android.view {
method public java.lang.Object getTag(int);
method public int getTextAlignment();
method public int getTextDirection();
method public final deprecated java.lang.CharSequence getTooltip();
method public final java.lang.CharSequence getTooltipText();
method public final int getTop();
method protected float getTopFadingEdgeStrength();
@@ -44393,7 +44392,6 @@ package android.view {
method public void setTag(int, java.lang.Object);
method public void setTextAlignment(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 setTop(int);
method public void setTouchDelegate(android.view.TouchDelegate);

2
api/system-current.txt
View File

@@ -47486,7 +47486,6 @@ package android.view {
method public java.lang.Object getTag(int);
method public int getTextAlignment();
method public int getTextDirection();
method public final deprecated java.lang.CharSequence getTooltip();
method public final java.lang.CharSequence getTooltipText();
method public final int getTop();
method protected float getTopFadingEdgeStrength();
@@ -47792,7 +47791,6 @@ package android.view {
method public void setTag(int, java.lang.Object);
method public void setTextAlignment(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 setTop(int);
method public void setTouchDelegate(android.view.TouchDelegate);

2
api/test-current.txt
View File

@@ -44391,7 +44391,6 @@ package android.view {
method public java.lang.Object getTag(int);
method public int getTextAlignment();
method public int getTextDirection();
method public final deprecated java.lang.CharSequence getTooltip();
method public final java.lang.CharSequence getTooltipText();
method public android.view.View getTooltipView();
method public final int getTop();
@@ -44698,7 +44697,6 @@ package android.view {
method public void setTag(int, java.lang.Object);
method public void setTextAlignment(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 setTop(int);
method public void setTouchDelegate(android.view.TouchDelegate);

21
core/java/android/view/View.java
View File

@@ -24758,16 +24758,6 @@ 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.
*
@@ -24778,17 +24768,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
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) {
if (mAttachInfo == null) {
return false;