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

1 files changed, 0 insertions, 21 deletions

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 9e5c37d26d3d..ba9bb67c1546 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -24759,16 +24759,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.
      *
      * @return the 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;