From d780d7cbcc7d37b9829208b2cf624600bc95ffa3 Mon Sep 17 00:00:00 2001
From: Manuel Martin <manmartin@mozilla.com>
Date: Wed, 21 Aug 2019 18:46:02 +0200
Subject: [PATCH] Fixes tooltips

---
 .../org/mozilla/vrbrowser/ui/views/UIButton.java   | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/UIButton.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/UIButton.java
index 49f974d1c..9d86e9a67 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/UIButton.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/UIButton.java
@@ -11,13 +11,13 @@
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.os.Handler;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
 import androidx.annotation.IdRes;
 import androidx.appcompat.widget.AppCompatImageButton;
 
+import org.mozilla.gecko.util.ThreadUtils;
 import org.mozilla.vrbrowser.R;
 import org.mozilla.vrbrowser.ui.widgets.TooltipWidget;
 import org.mozilla.vrbrowser.ui.widgets.UIWidget;
@@ -44,7 +44,6 @@ private enum State {
     private int mTooltipDelay;
     private float mTooltipDensity;
     private ViewUtils.TooltipPosition mTooltipPosition;
-    private Handler mHandler;
 
     public UIButton(Context context, AttributeSet attrs) {
         this(context, attrs, R.attr.imageButtonStyle);
@@ -74,7 +73,6 @@ public UIButton(Context context, AttributeSet attrs, int defStyleAttr) {
         mBackground = getBackground();
 
         mState = State.NORMAL;
-        mHandler = getHandler();
     }
 
     @TargetApi(Build.VERSION_CODES.O)
@@ -103,15 +101,11 @@ public void setTooltip(String text) {
     public boolean onHoverEvent(MotionEvent event) {
         if (getTooltip() != null) {
             if (event.getAction() == MotionEvent.ACTION_HOVER_ENTER) {
-                if (mHandler != null) {
-                    mHandler.postDelayed(mShowTooltipRunnable, mTooltipDelay);
-                }
+                ThreadUtils.postDelayedToUiThread(mShowTooltipRunnable, mTooltipDelay);
 
             } else if (event.getAction() == MotionEvent.ACTION_HOVER_EXIT) {
-                if (mHandler != null) {
-                    mHandler.removeCallbacks(mShowTooltipRunnable);
-                    mHandler.post(mHideTooltipRunnable);
-                }
+                ThreadUtils.removeCallbacksFromUiThread(mShowTooltipRunnable);
+                ThreadUtils.postToUiThread(mHideTooltipRunnable);
             }
         }