Revert UI animations (#2380)

* Revert all UI ease animations * Moved hiding library panels to onPageStart
MozillaReality · Nov 26, 2019 · 1cc152f · 1cc152f
1 parent e6f5e2b
commit 1cc152f
Show file tree

Hide file tree

Showing 95 changed files with 122 additions and 318 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
@@ -339,10 +339,6 @@ private void initialize(@NonNull Context aContext) {
 
         mPrefs = PreferenceManager.getDefaultSharedPreferences(mAppContext);
         mPrefs.registerOnSharedPreferenceChangeListener(this);
-
-        for (CustomUIButton button : mButtons) {
-            button.setPrivateMode(true);
-        }
     }
 
     @Override
@@ -781,10 +777,10 @@ public void onLocationChange(GeckoSession session, String url) {
     @Override
     public void onCanGoBack(GeckoSession aSession, boolean canGoBack) {
         if (mBackButton != null) {
-            boolean enableBackButton = getSession().canGoBack();
-
-            Log.d(LOGTAG, "Got onCanGoBack: " + (enableBackButton ? "true" : "false"));
-            mBackButton.setEnabled(enableBackButton);
+            Log.d(LOGTAG, "Got onCanGoBack: " + (canGoBack ? "true" : "false"));
+            mBackButton.setEnabled(canGoBack);
+            mBackButton.setHovered(false);
+            mBackButton.setClickable(canGoBack);
         }
     }
 
@@ -793,6 +789,8 @@ public void onCanGoForward(GeckoSession aSession, boolean canGoForward) {
         if (mForwardButton != null) {
             Log.d(LOGTAG, "Got onCanGoForward: " + (canGoForward ? "true" : "false"));
             mForwardButton.setEnabled(canGoForward);
+            mForwardButton.setHovered(false);
+            mForwardButton.setClickable(canGoForward);
         }
     }
 

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
@@ -1559,6 +1559,14 @@ public void onVideoAvailabilityChanged(boolean aVideosAvailable) {
     @Override
     public void onPageStart(@NonNull GeckoSession geckoSession, @NonNull String s) {
         mCaptureOnPageStop = true;
+
+        if (isHistoryVisible()) {
+            hideHistory();
+        }
+
+        if (isBookmarksVisible()) {
+            hideBookmarks();
+        }
     }
 
     @Override
@@ -1573,22 +1581,6 @@ public void captureImage() {
         mSession.captureBitmap();
     }
 
-    // GeckoSession.NavigationDelegate
-
-    @Nullable
-    @Override
-    public GeckoResult<AllowOrDeny> onLoadRequest(@NonNull GeckoSession geckoSession, @NonNull LoadRequest loadRequest) {
-        if (isHistoryVisible()) {
-            hideHistory();
-        }
-
-        if (isBookmarksVisible()) {
-            hideBookmarks();
-        }
-
-        return GeckoResult.ALLOW;
-    }
-
     @Override
     public void onLocationChange(@NonNull GeckoSession session, @Nullable String url) {
         updateTitleBarUrl(url);

diff --git a/app/src/main/res/color/fog_void_tint.xml b/app/src/main/res/color/fog_void_tint.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_hovered="true"
         android:color="@color/void_color"/> <!-- focused -->
     <item android:color="@color/fog"/> <!-- default -->

diff --git a/app/src/main/res/color/library_panel_button_text_color.xml b/app/src/main/res/color/library_panel_button_text_color.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/rhino" android:state_enabled="false" />
     <item android:color="@color/fog" android:state_pressed="true" />
     <item android:color="@color/asphalt" android:state_hovered="true" />

diff --git a/app/src/main/res/color/library_panel_context_menu_item_color.xml b/app/src/main/res/color/library_panel_context_menu_item_color.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:color="@color/fog"/>
     <item android:state_hovered="true" android:color="@color/asphalt"/>
     <item android:color="@color/fog"/>

diff --git a/app/src/main/res/color/library_panel_description_color.xml b/app/src/main/res/color/library_panel_description_color.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:color="@color/fog"/>
     <item android:state_hovered="true" android:color="@color/asphalt"/>
     <item android:color="@color/concrete"/>

diff --git a/app/src/main/res/color/library_panel_icon_color.xml b/app/src/main/res/color/library_panel_icon_color.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:color="@color/void_color"/>
     <item android:state_hovered="true" android:color="@color/smoke"/>
     <item android:color="@color/concrete"/>

diff --git a/app/src/main/res/color/library_panel_title_text_color.xml b/app/src/main/res/color/library_panel_title_text_color.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:color="@color/fog"/>
     <item android:state_hovered="true" android:color="@color/fog"/>
     <item android:color="@color/fog"/>

diff --git a/app/src/main/res/color/rhino_void_tint.xml b/app/src/main/res/color/rhino_void_tint.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_hovered="true"
         android:color="@color/void_color"/> <!-- focused -->
     <item android:color="@color/rhino"/> <!-- default -->

diff --git a/app/src/main/res/color/void_fog_tint.xml b/app/src/main/res/color/void_fog_tint.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_hovered="true"
         android:color="@color/fog"/> <!-- focused -->
     <item android:color="@color/void_color"/> <!-- default -->

diff --git a/app/src/main/res/drawable/autocompletion_item_active_color.xml b/app/src/main/res/drawable/autocompletion_item_active_color.xml
@@ -1,5 +1,3 @@
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/tangerine"/>
 </selector>
diff --git a/app/src/main/res/drawable/autocompletion_item_background.xml b/app/src/main/res/drawable/autocompletion_item_background.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
             <solid android:color="@color/void_color"/>

diff --git a/app/src/main/res/drawable/autocompletion_item_background_first.xml b/app/src/main/res/drawable/autocompletion_item_background_first.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
             <corners android:topLeftRadius="@dimen/keyboard_key_rounded_corner" android:bottomLeftRadius="@dimen/keyboard_key_rounded_corner"/>

diff --git a/app/src/main/res/drawable/autocompletion_item_background_last.xml b/app/src/main/res/drawable/autocompletion_item_background_last.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
             <corners android:topRightRadius="@dimen/keyboard_key_rounded_corner" android:bottomRightRadius="@dimen/keyboard_key_rounded_corner"/>

diff --git a/app/src/main/res/drawable/checkbox.xml b/app/src/main/res/drawable/checkbox.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item
             android:drawable="@drawable/ic_button_checkbox_on"
             android:state_checked="true"

diff --git a/app/src/main/res/drawable/content_panel_button_background.xml b/app/src/main/res/drawable/content_panel_button_background.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false">
         <shape android:shape="rectangle">
             <corners android:radius="2dp" />
@@ -26,4 +24,4 @@
             <stroke android:width="1pt" android:color="@color/fog" />
         </shape>
     </item>
-</animated-selector>
+</selector>
diff --git a/app/src/main/res/drawable/context_menu_item_background_color.xml b/app/src/main/res/drawable/context_menu_item_background_color.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true">
         <shape
             android:shape="rectangle">

diff --git a/app/src/main/res/drawable/dialog_button_text_color.xml b/app/src/main/res/drawable/dialog_button_text_color.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true"
           android:color="@color/fog"/>
     <item android:state_hovered="true" android:state_pressed="false"

diff --git a/app/src/main/res/drawable/dialog_close_button_background.xml b/app/src/main/res/drawable/dialog_close_button_background.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
             <corners android:radius="@dimen/keyboard_key_rounded_corner"/>

diff --git a/app/src/main/res/drawable/dialog_close_button_icon_color.xml b/app/src/main/res/drawable/dialog_close_button_icon_color.xml
@@ -1,6 +1,4 @@
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false"
         android:color="@color/void_color"/>
     <item android:state_pressed="true"

diff --git a/app/src/main/res/drawable/dialog_highlighted_button_background.xml b/app/src/main/res/drawable/dialog_highlighted_button_background.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
 <item android:state_pressed="true">
     <shape android:shape="rectangle">
         <corners android:radius="5dp" />

diff --git a/app/src/main/res/drawable/dialog_regular_button_background.xml b/app/src/main/res/drawable/dialog_regular_button_background.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
 <item android:state_pressed="true">
     <shape android:shape="rectangle">
         <corners android:radius="5dp" />

diff --git a/app/src/main/res/drawable/edittext_textcolor.xml b/app/src/main/res/drawable/edittext_textcolor.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true"
           android:color="@color/fog" /> <!-- pressed -->
     <item android:color="@color/asphalt" /> <!-- default -->

diff --git a/app/src/main/res/drawable/empty_drawable.xml b/app/src/main/res/drawable/empty_drawable.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_hovered="true">
         <shape>
         </shape>

diff --git a/app/src/main/res/drawable/fast_scroll_thumb.xml b/app/src/main/res/drawable/fast_scroll_thumb.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
             <size

diff --git a/app/src/main/res/drawable/fullscreen_button.xml b/app/src/main/res/drawable/fullscreen_button.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
             <stroke android:color="@color/void_color_blur" android:width="@dimen/blur_radius" />
@@ -20,4 +18,4 @@
             <solid android:color="@color/asphalt" />
         </shape>
     </item>
-</animated-selector>
+</selector>
diff --git a/app/src/main/res/drawable/fullscreen_button_first.xml b/app/src/main/res/drawable/fullscreen_button_first.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false">
         <shape android:shape="rectangle">
             <stroke android:color="@color/asphalt_blur" android:width="@dimen/blur_radius" />
@@ -46,4 +44,4 @@
                 android:bottomLeftRadius="20dp"/>
         </shape>
     </item>
-</animated-selector>
+</selector>
diff --git a/app/src/main/res/drawable/fullscreen_button_last.xml b/app/src/main/res/drawable/fullscreen_button_last.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
 <item android:state_enabled="false">
     <shape android:shape="rectangle">
         <stroke android:color="@color/asphalt_blur" android:width="@dimen/blur_radius" />
@@ -46,4 +44,4 @@
             android:bottomRightRadius="20dp"/>
     </shape>
 </item>
-</animated-selector>
+</selector>
diff --git a/app/src/main/res/drawable/fullscreen_button_private.xml b/app/src/main/res/drawable/fullscreen_button_private.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false">
         <shape android:shape="rectangle">
             <solid android:color="@color/eggplant" />
@@ -22,4 +20,4 @@
             <solid android:color="@color/eggplant" />
         </shape>
     </item>
-</animated-selector>
+</selector>
diff --git a/app/src/main/res/drawable/fullscreen_button_private_first.xml b/app/src/main/res/drawable/fullscreen_button_private_first.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false">
         <shape android:shape="rectangle">
             <solid android:color="@color/eggplant" />
@@ -42,4 +40,4 @@
                 android:bottomLeftRadius="20dp"/>
         </shape>
     </item>
-</animated-selector>
+</selector>
diff --git a/app/src/main/res/drawable/fullscreen_button_private_last.xml b/app/src/main/res/drawable/fullscreen_button_private_last.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false">
         <shape android:shape="rectangle">
             <solid android:color="@color/eggplant" />
@@ -30,4 +28,4 @@
             <corners android:bottomRightRadius="20dp" android:topRightRadius="20dp" />
         </shape>
     </item>
-</animated-selector>
+</selector>
diff --git a/app/src/main/res/drawable/ic_icon_empty.xml b/app/src/main/res/drawable/ic_icon_empty.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:drawable="@android:color/transparent" />
 </selector>
diff --git a/app/src/main/res/drawable/ic_icon_language_add.xml b/app/src/main/res/drawable/ic_icon_language_add.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:enterFadeDuration="@integer/ui_fadeAnimTime"
-    android:exitFadeDuration="@integer/ui_fadeAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@drawable/ic_icon_add" android:state_hovered="true" />
     <item android:drawable="@drawable/ic_icon_add" android:state_pressed="true" />
     <item android:drawable="@android:color/transparent" />