commit f5c6893dd030941d803772fa0682a79610081e20
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jan 24 20:56:05 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 24 20:56:08 2017 +0000
tree f94ec36d5c9b2746ee22bec9e471b9a66fb18cca
parent 52faea7acbad5bf9c2006db79353390ea915b18d
parent 3da84b4e3c5c7af65572304c7f1fe3fc81f6265d

Merge "Remove View.setTooltip/getTooltip"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 42242a7..93f9973 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -43879,7 +43879,6 @@
     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();
@@ -44178,7 +44177,6 @@
     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);

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index c159938..af63cbb 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -47228,7 +47228,6 @@
     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();
@@ -47527,7 +47526,6 @@
     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);

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index cc17d7f..ab94c0b 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -44170,7 +44170,6 @@
     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();
@@ -44470,7 +44469,6 @@
     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);

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 13555f4..66fd28f 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -24553,16 +24553,6 @@
     }
 
     /**
-     * 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
@@ -24572,17 +24562,6 @@
         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;