From 4db5dedb76ad86692361b0f9b30880eafc5ec3a7 Mon Sep 17 00:00:00 2001
From: Vladislav Kaznacheev <kaznacheev@google.com>
Date: Wed, 25 Jan 2017 19:24:15 +0000
Subject: [PATCH] Revert "Revert "Remove View.setTooltip/getTooltip""

This reverts commit c56c7462ef349efc11079c479424c0c60b473a47.

Change-Id: Id129d099e3579b2c51d77c1fee25816ba3bd9df7
---
 api/current.txt                  |  2 --
 api/system-current.txt           |  2 --
 api/test-current.txt             |  2 --
 core/java/android/view/View.java | 21 ---------------------
 4 files changed, 27 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 637cdac5b4fb0..69efae603dc52 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -43694,7 +43694,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();
@@ -43996,7 +43995,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);
diff --git a/api/system-current.txt b/api/system-current.txt
index f0e9ff5e8d091..814bb5f31158b 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -46996,7 +46996,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();
@@ -47298,7 +47297,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);
diff --git a/api/test-current.txt b/api/test-current.txt
index c4081f0d4b4d4..76edc0d1bcd27 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -43985,7 +43985,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();
@@ -44288,7 +44287,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);
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 26e311c6a9217..787132c38a152 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -24663,16 +24663,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.
      *
@@ -24683,17 +24673,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;