From ff51cf34dc016c2e6e1a0d0e31086302b79201e7 Mon Sep 17 00:00:00 2001
From: Manuel Martin <manmartin@mozilla.com>
Date: Fri, 8 Nov 2019 17:48:38 +0100
Subject: [PATCH] Force update the hover button state after being disabled
 though bindings (#2210)

---
 .../mozilla/vrbrowser/ui/views/settings/ButtonSetting.java | 7 +++++++
 app/src/main/res/drawable/rectangle_button_background.xml  | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/settings/ButtonSetting.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/settings/ButtonSetting.java
index adadd8e56..29bbeead3 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/settings/ButtonSetting.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/settings/ButtonSetting.java
@@ -114,4 +114,11 @@ public void setEnabled(boolean enabled) {
 
         mButton.setEnabled(enabled);
     }
+
+    @Override
+    public void setHovered(boolean hovered) {
+        super.setHovered(hovered);
+
+        mButton.setHovered(hovered);
+    }
 }
diff --git a/app/src/main/res/drawable/rectangle_button_background.xml b/app/src/main/res/drawable/rectangle_button_background.xml
index c0b896c49..bde969a93 100644
--- a/app/src/main/res/drawable/rectangle_button_background.xml
+++ b/app/src/main/res/drawable/rectangle_button_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
+<animated-selector xmlns:android="http://schemas.android.com/apk/res/android"
     android:enterFadeDuration="@integer/ui_fadeAnimTime"
     android:exitFadeDuration="@integer/ui_fadeAnimTime">
     <item android:state_enabled="false">
@@ -20,10 +20,10 @@
             <solid android:color="@color/fog" />
         </shape>
     </item>
-    <item android:state_hovered="false" android:state_pressed="false">
+    <item android:state_enabled="true">
         <shape android:shape="rectangle">
             <corners android:radius="5dp" />
             <solid android:color="@color/iron" />
         </shape>
     </item>
-</selector>
+</animated-selector>