4 files changed, 27 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 69efae603dc5..637cdac5b4fb 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -43694,6 +43694,7 @@ 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();
@@ -43995,6 +43996,7 @@ 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);
diff --git a/api/system-current.txt b/api/system-current.txt
index 814bb5f31158..f0e9ff5e8d09 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -46996,6 +46996,7 @@ 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();
@@ -47297,6 +47298,7 @@ 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);
diff --git a/api/test-current.txt b/api/test-current.txt
index 76edc0d1bcd2..c4081f0d4b4d 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -43985,6 +43985,7 @@ 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();
@@ -44287,6 +44288,7 @@ 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);
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 787132c38a15..26e311c6a921 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -24664,6 +24664,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.
      *
      * @return the tooltip text
@@ -24673,6 +24683,17 @@ 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;