Fixes #806 Controller back button on Go stops working after suggestio…

…ns dialog shown (#807)
MozillaReality · Nov 21, 2018 · 22ee10e · 22ee10e
1 parent d70ef7d
commit 22ee10e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java
@@ -786,7 +786,7 @@ public void OnShowSearchPopup() {
         final String text = mURLBar.getText().trim();
         final String originalText = mURLBar.getOriginalText().trim();
         if (originalText.length() <= 0) {
-            mPopup.setVisible(false);
+            mPopup.hide(UIWidget.KEEP_WIDGET);
             return;
         }
 
@@ -837,7 +837,7 @@ public void OnShowSearchPopup() {
     @Override
     public void OnHideSearchPopup() {
         if (mPopup != null) {
-            mPopup.setVisible(false);
+            mPopup.hide(UIWidget.KEEP_WIDGET);
         }
     }
 

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/UIWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/UIWidget.java
@@ -275,6 +275,9 @@ public void hide(@HideFlags int aHideFlags) {
             mWidgetPlacement.visible = false;
             if (aHideFlags == REMOVE_WIDGET) {
                 mWidgetManager.removeWidget(this);
+
+            } else {
+                mWidgetManager.updateWidget(this);
             }
             mWidgetManager.popBackHandler(mBackHandler);
         }

diff --git a/app/src/main/res/anim/popup_scaledown.xml b/app/src/main/res/anim/popup_scaledown.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android" >
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/accelerate_decelerate_interpolator">
     <scale
         android:duration="200"
         android:fromXScale="1.0"

diff --git a/app/src/main/res/anim/popup_scaleup.xml b/app/src/main/res/anim/popup_scaleup.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android" >
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/accelerate_decelerate_interpolator">
     <scale
         android:duration="200"
         android:fromXScale="1.0"