1 files changed, 5 insertions, 30 deletions
diff --git a/android/support/v7/widget/TooltipCompat.java b/android/support/v7/widget/TooltipCompat.java
index 470c3b2c..4a583da1 100644
--- a/android/support/v7/widget/TooltipCompat.java
+++ b/android/support/v7/widget/TooltipCompat.java
@@ -16,7 +16,6 @@
 
 package android.support.v7.widget;
 
-import android.annotation.TargetApi;
 import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -28,34 +27,6 @@ import android.view.View;
  *
  */
 public class TooltipCompat  {
-    private interface ViewCompatImpl {
-        void setTooltipText(@NonNull View view, @Nullable CharSequence tooltipText);
-    }
-
-    private static class BaseViewCompatImpl implements ViewCompatImpl {
-        @Override
-        public void setTooltipText(@NonNull View view, @Nullable CharSequence tooltipText) {
-            TooltipCompatHandler.setTooltipText(view, tooltipText);
-        }
-    }
-
-    @TargetApi(26)
-    private static class Api26ViewCompatImpl implements ViewCompatImpl {
-        @Override
-        public void setTooltipText(@NonNull View view, @Nullable CharSequence tooltipText) {
-            view.setTooltipText(tooltipText);
-        }
-    }
-
-    private static final ViewCompatImpl IMPL;
-    static {
-        if (Build.VERSION.SDK_INT >= 26) {
-            IMPL = new Api26ViewCompatImpl();
-        } else {
-            IMPL = new BaseViewCompatImpl();
-        }
-    }
-
     /**
      * Sets the tooltip text for the view.
      * <p> Prior to API 26 this method sets or clears (when tooltip is null) the view's
@@ -66,7 +37,11 @@ public class TooltipCompat  {
      * @param tooltipText the tooltip text
      */
     public static void setTooltipText(@NonNull View view, @Nullable CharSequence tooltipText) {
-        IMPL.setTooltipText(view, tooltipText);
+        if (Build.VERSION.SDK_INT >= 26) {
+            view.setTooltipText(tooltipText);
+        } else {
+            TooltipCompatHandler.setTooltipText(view, tooltipText);
+        }
     }
 
     private TooltipCompat() {}