From 1cc152f81faf84e04c99bd1efbb78f8a6c6ac9bf Mon Sep 17 00:00:00 2001
From: Manuel Martin <manmartin@mozilla.com>
Date: Tue, 26 Nov 2019 22:38:55 +0100
Subject: [PATCH] Revert UI animations (#2380)

* Revert all UI ease animations

* Moved hiding library panels to onPageStart
---
 .../ui/widgets/NavigationBarWidget.java       | 14 +++++------
 .../vrbrowser/ui/widgets/WindowWidget.java    | 24 +++++++------------
 app/src/main/res/color/fog_void_tint.xml      |  4 +---
 .../color/library_panel_button_text_color.xml |  3 +--
 .../library_panel_context_menu_item_color.xml |  4 +---
 .../color/library_panel_description_color.xml |  4 +---
 .../res/color/library_panel_icon_color.xml    |  4 +---
 .../color/library_panel_title_text_color.xml  |  4 +---
 app/src/main/res/color/rhino_void_tint.xml    |  4 +---
 app/src/main/res/color/void_fog_tint.xml      |  4 +---
 .../autocompletion_item_active_color.xml      |  4 +---
 .../autocompletion_item_background.xml        |  4 +---
 .../autocompletion_item_background_first.xml  |  4 +---
 .../autocompletion_item_background_last.xml   |  4 +---
 app/src/main/res/drawable/checkbox.xml        |  4 +---
 .../content_panel_button_background.xml       |  6 ++---
 .../context_menu_item_background_color.xml    |  4 +---
 .../res/drawable/dialog_button_text_color.xml |  4 +---
 .../dialog_close_button_background.xml        |  4 +---
 .../dialog_close_button_icon_color.xml        |  4 +---
 .../dialog_highlighted_button_background.xml  |  4 +---
 .../dialog_regular_button_background.xml      |  4 +---
 .../main/res/drawable/edittext_textcolor.xml  |  4 +---
 app/src/main/res/drawable/empty_drawable.xml  |  4 +---
 .../main/res/drawable/fast_scroll_thumb.xml   |  4 +---
 .../main/res/drawable/fullscreen_button.xml   |  6 ++---
 .../res/drawable/fullscreen_button_first.xml  |  6 ++---
 .../res/drawable/fullscreen_button_last.xml   |  6 ++---
 .../drawable/fullscreen_button_private.xml    |  6 ++---
 .../fullscreen_button_private_first.xml       |  6 ++---
 .../fullscreen_button_private_last.xml        |  6 ++---
 app/src/main/res/drawable/ic_icon_empty.xml   |  4 +---
 .../res/drawable/ic_icon_language_add.xml     |  4 +---
 .../res/drawable/ic_icon_language_delete.xml  |  4 +---
 .../drawable/ic_icon_language_move_down.xml   |  4 +---
 .../res/drawable/ic_icon_language_move_up.xml |  4 +---
 .../drawable/keyboard_button_background.xml   |  4 +---
 .../lang_selector_button_background.xml       |  4 +---
 .../drawable/lang_selector_button_color.xml   |  4 +---
 ...ry_context_menu_item_background_bottom.xml |  6 ++---
 ...ry_context_menu_item_background_middle.xml |  6 ++---
 ...ry_context_menu_item_background_single.xml |  6 ++---
 ...brary_context_menu_item_background_top.xml |  6 ++---
 .../library_item_background_color.xml         |  4 +---
 app/src/main/res/drawable/main_button.xml     |  8 +++----
 .../res/drawable/main_button_icon_color.xml   |  4 +---
 .../main_button_icon_color_active.xml         |  4 +---
 .../main_button_icon_color_notification.xml   |  4 +---
 .../main_button_icon_color_private.xml        |  4 +---
 .../main/res/drawable/main_button_private.xml |  8 +++----
 .../res/drawable/main_button_text_color.xml   |  4 +---
 app/src/main/res/drawable/media_button.xml    |  4 +---
 .../main/res/drawable/media_seekbar_thumb.xml |  4 +---
 .../res/drawable/menu_item_background.xml     |  4 +---
 .../drawable/menu_item_background_first.xml   |  4 +---
 .../drawable/menu_item_background_last.xml    |  4 +---
 .../drawable/menu_item_background_single.xml  |  2 +-
 app/src/main/res/drawable/menu_item_color.xml |  4 +---
 .../res/drawable/navigation_button_color.xml  |  4 +---
 .../res/drawable/panel_button_background.xml  |  4 +---
 .../res/drawable/prompt_button_background.xml |  4 +---
 .../res/drawable/prompt_button_text_color.xml |  4 +---
 .../res/drawable/prompt_item_check_color.xml  |  4 +---
 .../res/drawable/prompt_item_text_color.xml   |  4 +---
 app/src/main/res/drawable/radio.xml           |  4 +---
 app/src/main/res/drawable/radio_black.xml     |  4 +---
 .../main/res/drawable/radio_checked_hover.xml |  4 +---
 app/src/main/res/drawable/radio_off.xml       |  4 +---
 app/src/main/res/drawable/radio_on.xml        |  4 +---
 .../res/drawable/radio_unchecked_hover.xml    |  4 +---
 .../res/drawable/radio_unchecked_pressed.xml  |  4 +---
 .../drawable/rectangle_button_background.xml  |  6 ++---
 .../setting_help_button_background.xml        |  4 +---
 .../settings_honeycomb_background.xml         |  4 +---
 .../settings_list_row_background_color.xml    |  4 +---
 .../drawable/suggestion_background_color.xml  |  4 +---
 .../drawable/suggestion_description_color.xml |  4 +---
 .../res/drawable/suggestion_icon_color.xml    |  4 +---
 .../res/drawable/suggestion_text_color.xml    |  4 +---
 app/src/main/res/drawable/switch_thumb.xml    |  4 +---
 app/src/main/res/drawable/switch_track.xml    |  4 +---
 app/src/main/res/drawable/text_button.xml     |  4 +---
 .../main/res/drawable/text_button_private.xml |  4 +---
 .../res/drawable/title_bar_background.xml     |  4 +---
 .../drawable/title_bar_background_private.xml |  4 +---
 app/src/main/res/drawable/url_background.xml  |  4 +---
 .../res/drawable/url_background_private.xml   |  4 +---
 app/src/main/res/drawable/url_button.xml      |  4 +---
 app/src/main/res/drawable/url_button_end.xml  |  4 +---
 .../res/drawable/url_button_end_private.xml   |  4 +---
 .../res/drawable/url_button_icon_color.xml    |  4 +---
 .../main/res/drawable/url_button_private.xml  |  4 +---
 .../main/res/drawable/url_button_start.xml    |  4 +---
 .../res/drawable/url_button_start_private.xml |  4 +---
 app/src/main/res/values/integer.xml           |  5 ----
 95 files changed, 122 insertions(+), 318 deletions(-)
 delete mode 100644 app/src/main/res/values/integer.xml

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
index 3e36bb934..be1fa4831 100644
--- 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
index ebd0b0a6b..7a6910f90 100644
--- 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
index 7bc860bce..8ddbd75ee 100644
--- 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
index daf8f8ebd..34a5813a7 100644
--- 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
index 7874cdfcf..c944e626d 100644
--- 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
index 07deb1020..863ea1a6e 100644
--- 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
index 1b8ba77f5..0d8615217 100644
--- 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
index 0c4b800c5..93a26e2d7 100644
--- 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
index 096117c90..bc67a9dd5 100644
--- 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
index 69ca800b7..e3c37f612 100644
--- 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
index 7627665e0..5f9d4e672 100644
--- 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>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/autocompletion_item_background.xml b/app/src/main/res/drawable/autocompletion_item_background.xml
index 0f0e82ea2..7025a479f 100644
--- 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
index af7b2f4f0..ffb1fb13b 100644
--- 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
index 1a3b15ba0..1e8544bc4 100644
--- 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
index a3d03a68e..0b498cfc0 100644
--- 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
index ad189781e..165d0f402 100644
--- 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>
\ No newline at end of file
+</selector>
\ No newline at end of file
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
index 51687024e..489461eaa 100644
--- 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
index 67c3365cb..e25a30918 100644
--- 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
index 4aff5fe82..564ea037e 100644
--- 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
index c5c901e82..af1298c81 100644
--- 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
index df106b119..0496c6c89 100644
--- 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
index 76599eeff..ebbe02690 100644
--- 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
index cf352e838..cfd780220 100644
--- 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
index 55453b8ac..b56e31ded 100644
--- 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
index ef7e25b2e..9ff908967 100644
--- 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
index f8d9e55db..eaded2363 100644
--- 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
index b0e6d3a79..d42dd060e 100644
--- 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
index 0f2b47ece..1310497fe 100644
--- 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
index d7ed4855c..6a4b68fc8 100644
--- 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
index 49e32ed75..a27b82c5d 100644
--- 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
index f2dc4b46f..9dc160b90 100644
--- 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
index 7fb20b222..e541f4f05 100644
--- 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>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_icon_language_add.xml b/app/src/main/res/drawable/ic_icon_language_add.xml
index edcb72f55..5ca999837 100644
--- 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" />
diff --git a/app/src/main/res/drawable/ic_icon_language_delete.xml b/app/src/main/res/drawable/ic_icon_language_delete.xml
index d2e167e4f..412dee4cf 100644
--- a/app/src/main/res/drawable/ic_icon_language_delete.xml
+++ b/app/src/main/res/drawable/ic_icon_language_delete.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_delete" android:state_hovered="true" android:color="@color/smoke" />
     <item android:drawable="@drawable/ic_icon_delete" android:state_pressed="true" android:color="@color/void_color" />
     <item android:drawable="@android:color/transparent" />
diff --git a/app/src/main/res/drawable/ic_icon_language_move_down.xml b/app/src/main/res/drawable/ic_icon_language_move_down.xml
index 224e469c8..7b8832c12 100644
--- a/app/src/main/res/drawable/ic_icon_language_move_down.xml
+++ b/app/src/main/res/drawable/ic_icon_language_move_down.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_move_down" android:state_hovered="true" />
     <item android:drawable="@drawable/ic_icon_move_down" android:state_pressed="true" />
     <item android:drawable="@android:color/transparent" />
diff --git a/app/src/main/res/drawable/ic_icon_language_move_up.xml b/app/src/main/res/drawable/ic_icon_language_move_up.xml
index 44dbe6acf..07bdc2552 100644
--- a/app/src/main/res/drawable/ic_icon_language_move_up.xml
+++ b/app/src/main/res/drawable/ic_icon_language_move_up.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_move_up" android:state_hovered="true" />
     <item android:drawable="@drawable/ic_icon_move_up" android:state_pressed="true" />
     <item android:drawable="@android:color/transparent" />
diff --git a/app/src/main/res/drawable/keyboard_button_background.xml b/app/src/main/res/drawable/keyboard_button_background.xml
index 4aff5fe82..564ea037e 100644
--- a/app/src/main/res/drawable/keyboard_button_background.xml
+++ b/app/src/main/res/drawable/keyboard_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/lang_selector_button_background.xml b/app/src/main/res/drawable/lang_selector_button_background.xml
index e4aa03a86..e872244a5 100644
--- a/app/src/main/res/drawable/lang_selector_button_background.xml
+++ b/app/src/main/res/drawable/lang_selector_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_selected="true">
         <shape android:shape="rectangle">
             <corners android:radius="@dimen/keyboard_language_rounded_corner"/>
diff --git a/app/src/main/res/drawable/lang_selector_button_color.xml b/app/src/main/res/drawable/lang_selector_button_color.xml
index 170015bb1..bdfb33755 100644
--- a/app/src/main/res/drawable/lang_selector_button_color.xml
+++ b/app/src/main/res/drawable/lang_selector_button_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_selected="true"
         android:color="@color/void_color"/>
     <item android:state_pressed="true"
diff --git a/app/src/main/res/drawable/library_context_menu_item_background_bottom.xml b/app/src/main/res/drawable/library_context_menu_item_background_bottom.xml
index 6f9c5d7fa..0aeeefce1 100644
--- a/app/src/main/res/drawable/library_context_menu_item_background_bottom.xml
+++ b/app/src/main/res/drawable/library_context_menu_item_background_bottom.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">
             <solid android:color="@color/void_color" />
@@ -20,4 +18,4 @@
             <corners android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" />
         </shape>
     </item>
-</animated-selector>
\ No newline at end of file
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/library_context_menu_item_background_middle.xml b/app/src/main/res/drawable/library_context_menu_item_background_middle.xml
index b1a16b85a..0c7d42ab7 100644
--- a/app/src/main/res/drawable/library_context_menu_item_background_middle.xml
+++ b/app/src/main/res/drawable/library_context_menu_item_background_middle.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">
             <solid android:color="@color/void_color" />
@@ -17,4 +15,4 @@
             <solid android:color="@color/asphalt" />
         </shape>
     </item>
-</animated-selector>
\ No newline at end of file
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/library_context_menu_item_background_single.xml b/app/src/main/res/drawable/library_context_menu_item_background_single.xml
index 4ab39bbd7..7c243ee02 100644
--- a/app/src/main/res/drawable/library_context_menu_item_background_single.xml
+++ b/app/src/main/res/drawable/library_context_menu_item_background_single.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">
             <solid android:color="@color/void_color" />
@@ -20,4 +18,4 @@
             <corners android:radius="5dp" />
         </shape>
     </item>
-</animated-selector>
\ No newline at end of file
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/library_context_menu_item_background_top.xml b/app/src/main/res/drawable/library_context_menu_item_background_top.xml
index e8ef4c799..93fbfdd02 100644
--- a/app/src/main/res/drawable/library_context_menu_item_background_top.xml
+++ b/app/src/main/res/drawable/library_context_menu_item_background_top.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">
             <solid android:color="@color/void_color" />
@@ -20,4 +18,4 @@
             <corners android:topLeftRadius="5dp" android:topRightRadius="5dp" />
         </shape>
     </item>
-</animated-selector>
\ No newline at end of file
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/library_item_background_color.xml b/app/src/main/res/drawable/library_item_background_color.xml
index 4dc6d05c8..7835fe288 100644
--- a/app/src/main/res/drawable/library_item_background_color.xml
+++ b/app/src/main/res/drawable/library_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/main_button.xml b/app/src/main/res/drawable/main_button.xml
index b9c9177a0..5eac9751e 100644
--- a/app/src/main/res/drawable/main_button.xml
+++ b/app/src/main/res/drawable/main_button.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_enabled="false">
         <shape android:shape="oval">
             <stroke android:color="@color/asphalt_blur" android:width="@dimen/blur_radius" />
@@ -14,13 +12,13 @@
             <solid android:color="@color/void_color" />
         </shape>
     </item>
-    <item android:state_hovered="true" android:state_pressed="false">
+    <item android:state_hovered="true">
         <shape android:shape="oval">
             <stroke android:color="@color/fog_blur" android:width="@dimen/blur_radius" />
             <solid android:color="@color/fog" />
         </shape>
     </item>
-    <item android:state_hovered="false" android:state_pressed="false">
+    <item>
         <shape android:shape="oval">
             <stroke android:color="@color/asphalt_blur" android:width="@dimen/blur_radius" />
             <solid android:color="@color/asphalt" />
diff --git a/app/src/main/res/drawable/main_button_icon_color.xml b/app/src/main/res/drawable/main_button_icon_color.xml
index c5c901e82..af1298c81 100644
--- a/app/src/main/res/drawable/main_button_icon_color.xml
+++ b/app/src/main/res/drawable/main_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/main_button_icon_color_active.xml b/app/src/main/res/drawable/main_button_icon_color_active.xml
index 6e1fa43bc..4fe8b51b8 100644
--- a/app/src/main/res/drawable/main_button_icon_color_active.xml
+++ b/app/src/main/res/drawable/main_button_icon_color_active.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/main_button_icon_color_notification.xml b/app/src/main/res/drawable/main_button_icon_color_notification.xml
index 28e2644c0..c9847983e 100644
--- a/app/src/main/res/drawable/main_button_icon_color_notification.xml
+++ b/app/src/main/res/drawable/main_button_icon_color_notification.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/main_button_icon_color_private.xml b/app/src/main/res/drawable/main_button_icon_color_private.xml
index b8daf6cb7..943ca05a7 100644
--- a/app/src/main/res/drawable/main_button_icon_color_private.xml
+++ b/app/src/main/res/drawable/main_button_icon_color_private.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/blackberry"/>
     <item android:state_pressed="true"
diff --git a/app/src/main/res/drawable/main_button_private.xml b/app/src/main/res/drawable/main_button_private.xml
index 0b1eb05d6..cb63d2eb9 100644
--- a/app/src/main/res/drawable/main_button_private.xml
+++ b/app/src/main/res/drawable/main_button_private.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_enabled="false">
         <shape android:shape="oval">
             <solid android:color="@color/eggplant" />
@@ -14,13 +12,13 @@
             <stroke android:width="@dimen/blur_radius" android:color="@color/blackberry_blur" />
         </shape>
     </item>
-    <item android:state_hovered="true" android:state_pressed="false">
+    <item android:state_hovered="true">
         <shape android:shape="oval">
             <solid android:color="@color/fog" />
             <stroke android:width="@dimen/blur_radius" android:color="@color/fog_blur" />
         </shape>
     </item>
-    <item android:state_hovered="false" android:state_pressed="false">
+    <item>
         <shape android:shape="oval">
             <solid android:color="@color/eggplant" />
             <stroke android:width="@dimen/blur_radius" android:color="@color/eggplant_blur" />
diff --git a/app/src/main/res/drawable/main_button_text_color.xml b/app/src/main/res/drawable/main_button_text_color.xml
index e075e7adf..c13acc9ac 100644
--- a/app/src/main/res/drawable/main_button_text_color.xml
+++ b/app/src/main/res/drawable/main_button_text_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/rhino"/>
     <item android:state_pressed="true"
diff --git a/app/src/main/res/drawable/media_button.xml b/app/src/main/res/drawable/media_button.xml
index 3a9464926..9670c7f13 100644
--- a/app/src/main/res/drawable/media_button.xml
+++ b/app/src/main/res/drawable/media_button.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="oval">
             <solid android:color="@color/void_color" />
diff --git a/app/src/main/res/drawable/media_seekbar_thumb.xml b/app/src/main/res/drawable/media_seekbar_thumb.xml
index 8b9edcd6b..2c3f670db 100644
--- a/app/src/main/res/drawable/media_seekbar_thumb.xml
+++ b/app/src/main/res/drawable/media_seekbar_thumb.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>
         <shape android:shape="oval">
             <solid android:color="@color/fog" />
diff --git a/app/src/main/res/drawable/menu_item_background.xml b/app/src/main/res/drawable/menu_item_background.xml
index 6c6a3af90..ae8c5b2bd 100644
--- a/app/src/main/res/drawable/menu_item_background.xml
+++ b/app/src/main/res/drawable/menu_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/iron" />
diff --git a/app/src/main/res/drawable/menu_item_background_first.xml b/app/src/main/res/drawable/menu_item_background_first.xml
index b9d687151..d29b41d7f 100644
--- a/app/src/main/res/drawable/menu_item_background_first.xml
+++ b/app/src/main/res/drawable/menu_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">
             <solid android:color="@color/iron" />
diff --git a/app/src/main/res/drawable/menu_item_background_last.xml b/app/src/main/res/drawable/menu_item_background_last.xml
index a4d29cfbf..718283cce 100644
--- a/app/src/main/res/drawable/menu_item_background_last.xml
+++ b/app/src/main/res/drawable/menu_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">
             <solid android:color="@color/iron" />
diff --git a/app/src/main/res/drawable/menu_item_background_single.xml b/app/src/main/res/drawable/menu_item_background_single.xml
index 43f1f7505..7480fd2b6 100644
--- a/app/src/main/res/drawable/menu_item_background_single.xml
+++ b/app/src/main/res/drawable/menu_item_background_single.xml
@@ -1,5 +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:bottomLeftRadius="@dimen/menu_corner_radius" android:bottomRightRadius="@dimen/menu_corner_radius" android:topLeftRadius="@dimen/menu_corner_radius" android:topRightRadius="@dimen/menu_corner_radius" />
diff --git a/app/src/main/res/drawable/menu_item_color.xml b/app/src/main/res/drawable/menu_item_color.xml
index d306a0f9e..253d1fe39 100644
--- a/app/src/main/res/drawable/menu_item_color.xml
+++ b/app/src/main/res/drawable/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_hovered="true" android:state_pressed="false" android:color="@color/asphalt"/>
     <item android:color="@color/fog"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/navigation_button_color.xml b/app/src/main/res/drawable/navigation_button_color.xml
index d9ed0e8b2..2e065ccfe 100644
--- a/app/src/main/res/drawable/navigation_button_color.xml
+++ b/app/src/main/res/drawable/navigation_button_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/spark"/>
     <item android:state_hovered="true" android:state_pressed="false"
diff --git a/app/src/main/res/drawable/panel_button_background.xml b/app/src/main/res/drawable/panel_button_background.xml
index 76f3063cd..8452fb7e4 100644
--- a/app/src/main/res/drawable/panel_button_background.xml
+++ b/app/src/main/res/drawable/panel_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_enabled="false">
         <shape android:shape="rectangle">
             <corners android:radius="10dp" />
diff --git a/app/src/main/res/drawable/prompt_button_background.xml b/app/src/main/res/drawable/prompt_button_background.xml
index ac6759f7e..28e06fa5a 100644
--- a/app/src/main/res/drawable/prompt_button_background.xml
+++ b/app/src/main/res/drawable/prompt_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_enabled="false">
         <shape android:shape="rectangle">
             <corners android:radius="2dp" />
diff --git a/app/src/main/res/drawable/prompt_button_text_color.xml b/app/src/main/res/drawable/prompt_button_text_color.xml
index 98adb7c34..123067ff4 100644
--- a/app/src/main/res/drawable/prompt_button_text_color.xml
+++ b/app/src/main/res/drawable/prompt_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/void_color"/>
     <item android:state_hovered="true" android:state_pressed="false"
diff --git a/app/src/main/res/drawable/prompt_item_check_color.xml b/app/src/main/res/drawable/prompt_item_check_color.xml
index c2bc43673..b207801a0 100644
--- a/app/src/main/res/drawable/prompt_item_check_color.xml
+++ b/app/src/main/res/drawable/prompt_item_check_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:state_hovered="false">
         <vector android:height="24dp" android:viewportHeight="200"
                 android:viewportWidth="200" android:width="24dp">
diff --git a/app/src/main/res/drawable/prompt_item_text_color.xml b/app/src/main/res/drawable/prompt_item_text_color.xml
index 98d47b968..20c3b800d 100644
--- a/app/src/main/res/drawable/prompt_item_text_color.xml
+++ b/app/src/main/res/drawable/prompt_item_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_hovered="true" android:color="@color/void_color"/>
     <item android:state_enabled="false" android:color="@color/iron"/>
     <item android:color="@color/white"/>
diff --git a/app/src/main/res/drawable/radio.xml b/app/src/main/res/drawable/radio.xml
index 7f9fe5fdb..6085aaa7c 100644
--- a/app/src/main/res/drawable/radio.xml
+++ b/app/src/main/res/drawable/radio.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/radio_off"
         android:state_checked="true"
diff --git a/app/src/main/res/drawable/radio_black.xml b/app/src/main/res/drawable/radio_black.xml
index 0f49d03fc..e56592374 100644
--- a/app/src/main/res/drawable/radio_black.xml
+++ b/app/src/main/res/drawable/radio_black.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>
         <vector xmlns:android="http://schemas.android.com/apk/res/android"
                 android:width="24dp"
diff --git a/app/src/main/res/drawable/radio_checked_hover.xml b/app/src/main/res/drawable/radio_checked_hover.xml
index 832a2c774..e653ccea8 100644
--- a/app/src/main/res/drawable/radio_checked_hover.xml
+++ b/app/src/main/res/drawable/radio_checked_hover.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>
         <vector xmlns:android="http://schemas.android.com/apk/res/android"
                 android:width="24dp"
diff --git a/app/src/main/res/drawable/radio_off.xml b/app/src/main/res/drawable/radio_off.xml
index 255acaeec..231adc70a 100644
--- a/app/src/main/res/drawable/radio_off.xml
+++ b/app/src/main/res/drawable/radio_off.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>
         <vector xmlns:android="http://schemas.android.com/apk/res/android"
                 android:width="24dp"
diff --git a/app/src/main/res/drawable/radio_on.xml b/app/src/main/res/drawable/radio_on.xml
index b211c510d..01b147680 100644
--- a/app/src/main/res/drawable/radio_on.xml
+++ b/app/src/main/res/drawable/radio_on.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>
         <vector xmlns:android="http://schemas.android.com/apk/res/android"
                 android:width="24dp"
diff --git a/app/src/main/res/drawable/radio_unchecked_hover.xml b/app/src/main/res/drawable/radio_unchecked_hover.xml
index f4730460c..6a9b71f38 100644
--- a/app/src/main/res/drawable/radio_unchecked_hover.xml
+++ b/app/src/main/res/drawable/radio_unchecked_hover.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>
         <vector xmlns:android="http://schemas.android.com/apk/res/android"
                 android:width="24dp"
diff --git a/app/src/main/res/drawable/radio_unchecked_pressed.xml b/app/src/main/res/drawable/radio_unchecked_pressed.xml
index 0f49d03fc..e56592374 100644
--- a/app/src/main/res/drawable/radio_unchecked_pressed.xml
+++ b/app/src/main/res/drawable/radio_unchecked_pressed.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>
         <vector xmlns:android="http://schemas.android.com/apk/res/android"
                 android:width="24dp"
diff --git a/app/src/main/res/drawable/rectangle_button_background.xml b/app/src/main/res/drawable/rectangle_button_background.xml
index bde969a93..a78be9e32 100644
--- a/app/src/main/res/drawable/rectangle_button_background.xml
+++ b/app/src/main/res/drawable/rectangle_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="5dp" />
@@ -26,4 +24,4 @@
             <solid android:color="@color/iron" />
         </shape>
     </item>
-</animated-selector>
+</selector>
diff --git a/app/src/main/res/drawable/setting_help_button_background.xml b/app/src/main/res/drawable/setting_help_button_background.xml
index 93c32d82f..7dc5098f2 100644
--- a/app/src/main/res/drawable/setting_help_button_background.xml
+++ b/app/src/main/res/drawable/setting_help_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_enabled="false">
         <shape android:shape="oval">
             <solid android:color="@color/asphalt" />
diff --git a/app/src/main/res/drawable/settings_honeycomb_background.xml b/app/src/main/res/drawable/settings_honeycomb_background.xml
index 016ce1e12..4579cee7d 100644
--- a/app/src/main/res/drawable/settings_honeycomb_background.xml
+++ b/app/src/main/res/drawable/settings_honeycomb_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">
         <vector android:width="200dp"
             android:height="200dp"
diff --git a/app/src/main/res/drawable/settings_list_row_background_color.xml b/app/src/main/res/drawable/settings_list_row_background_color.xml
index 4dc6d05c8..7835fe288 100644
--- a/app/src/main/res/drawable/settings_list_row_background_color.xml
+++ b/app/src/main/res/drawable/settings_list_row_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/suggestion_background_color.xml b/app/src/main/res/drawable/suggestion_background_color.xml
index 40ac6d216..957a1395c 100644
--- a/app/src/main/res/drawable/suggestion_background_color.xml
+++ b/app/src/main/res/drawable/suggestion_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" android:drawable="@color/void_color"/>
     <item android:state_hovered="true" android:drawable="@color/fog"/>
     <item android:drawable="@color/asphalt"/>
diff --git a/app/src/main/res/drawable/suggestion_description_color.xml b/app/src/main/res/drawable/suggestion_description_color.xml
index 0c39d1180..577450005 100644
--- a/app/src/main/res/drawable/suggestion_description_color.xml
+++ b/app/src/main/res/drawable/suggestion_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/rhino"/>
     <item android:state_hovered="true" android:color="@color/rhino"/>
     <item android:color="@color/rhino"/>
diff --git a/app/src/main/res/drawable/suggestion_icon_color.xml b/app/src/main/res/drawable/suggestion_icon_color.xml
index e35e82146..0eac69513 100644
--- a/app/src/main/res/drawable/suggestion_icon_color.xml
+++ b/app/src/main/res/drawable/suggestion_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/rhino"/>
     <item android:state_hovered="true" android:color="@color/iron"/>
     <item android:color="@color/rhino"/>
diff --git a/app/src/main/res/drawable/suggestion_text_color.xml b/app/src/main/res/drawable/suggestion_text_color.xml
index b9dc27e84..5ec95bdf3 100644
--- a/app/src/main/res/drawable/suggestion_text_color.xml
+++ b/app/src/main/res/drawable/suggestion_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/rhino"/>
     <item android:color="@color/fog"/>
diff --git a/app/src/main/res/drawable/switch_thumb.xml b/app/src/main/res/drawable/switch_thumb.xml
index 0029ed72c..f8442af02 100644
--- a/app/src/main/res/drawable/switch_thumb.xml
+++ b/app/src/main/res/drawable/switch_thumb.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_enabled="false">
         <layer-list>
             <item
diff --git a/app/src/main/res/drawable/switch_track.xml b/app/src/main/res/drawable/switch_track.xml
index d434ee13c..d70a034d5 100644
--- a/app/src/main/res/drawable/switch_track.xml
+++ b/app/src/main/res/drawable/switch_track.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_enabled="false">
         <layer-list>
             <item>
diff --git a/app/src/main/res/drawable/text_button.xml b/app/src/main/res/drawable/text_button.xml
index 1ba2f2622..29fcc68c3 100644
--- a/app/src/main/res/drawable/text_button.xml
+++ b/app/src/main/res/drawable/text_button.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_enabled="false">
         <shape android:shape="rectangle">
             <solid android:color="@color/asphalt" />
diff --git a/app/src/main/res/drawable/text_button_private.xml b/app/src/main/res/drawable/text_button_private.xml
index bfd809e63..0ae770fc7 100644
--- a/app/src/main/res/drawable/text_button_private.xml
+++ b/app/src/main/res/drawable/text_button_private.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_enabled="false">
         <shape android:shape="rectangle">
             <solid android:color="@color/eggplant" />
diff --git a/app/src/main/res/drawable/title_bar_background.xml b/app/src/main/res/drawable/title_bar_background.xml
index f83cfb45d..516f3cbc8 100644
--- a/app/src/main/res/drawable/title_bar_background.xml
+++ b/app/src/main/res/drawable/title_bar_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">
         <layer-list>
             <item>
diff --git a/app/src/main/res/drawable/title_bar_background_private.xml b/app/src/main/res/drawable/title_bar_background_private.xml
index 475866940..4912daf8b 100644
--- a/app/src/main/res/drawable/title_bar_background_private.xml
+++ b/app/src/main/res/drawable/title_bar_background_private.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">
         <layer-list>
             <item>
diff --git a/app/src/main/res/drawable/url_background.xml b/app/src/main/res/drawable/url_background.xml
index f21280ec8..e1d0e06b5 100644
--- a/app/src/main/res/drawable/url_background.xml
+++ b/app/src/main/res/drawable/url_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_enabled="false">
         <shape android:shape="rectangle">
             <corners android:radius="20dp" />
diff --git a/app/src/main/res/drawable/url_background_private.xml b/app/src/main/res/drawable/url_background_private.xml
index 33ed3953b..f21f8ff89 100644
--- a/app/src/main/res/drawable/url_background_private.xml
+++ b/app/src/main/res/drawable/url_background_private.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_enabled="false">
         <shape android:shape="rectangle">
             <corners android:radius="20dp" />
diff --git a/app/src/main/res/drawable/url_button.xml b/app/src/main/res/drawable/url_button.xml
index 43dd8ba89..31b43387a 100644
--- a/app/src/main/res/drawable/url_button.xml
+++ b/app/src/main/res/drawable/url_button.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_enabled="false">
         <shape android:shape="rectangle">
             <solid android:color="@android:color/transparent" />
diff --git a/app/src/main/res/drawable/url_button_end.xml b/app/src/main/res/drawable/url_button_end.xml
index 75d10af5c..4360f6f1c 100644
--- a/app/src/main/res/drawable/url_button_end.xml
+++ b/app/src/main/res/drawable/url_button_end.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_enabled="false">
         <shape android:shape="rectangle">
             <corners android:bottomRightRadius="20dp" android:topRightRadius="20dp" />
diff --git a/app/src/main/res/drawable/url_button_end_private.xml b/app/src/main/res/drawable/url_button_end_private.xml
index 90c917a7d..de9ec0b5e 100644
--- a/app/src/main/res/drawable/url_button_end_private.xml
+++ b/app/src/main/res/drawable/url_button_end_private.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_enabled="false">
         <shape android:shape="rectangle">
             <corners android:bottomRightRadius="20dp" android:topRightRadius="20dp" />
diff --git a/app/src/main/res/drawable/url_button_icon_color.xml b/app/src/main/res/drawable/url_button_icon_color.xml
index c5c901e82..af1298c81 100644
--- a/app/src/main/res/drawable/url_button_icon_color.xml
+++ b/app/src/main/res/drawable/url_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/url_button_private.xml b/app/src/main/res/drawable/url_button_private.xml
index 8f152518a..73614bcaa 100644
--- a/app/src/main/res/drawable/url_button_private.xml
+++ b/app/src/main/res/drawable/url_button_private.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_enabled="false">
         <shape android:shape="rectangle">
             <solid android:color="@android:color/transparent" />
diff --git a/app/src/main/res/drawable/url_button_start.xml b/app/src/main/res/drawable/url_button_start.xml
index e70e59d92..985471d55 100644
--- a/app/src/main/res/drawable/url_button_start.xml
+++ b/app/src/main/res/drawable/url_button_start.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_enabled="false">
         <shape android:shape="rectangle">
             <corners android:bottomLeftRadius="20dp" android:topLeftRadius="20dp" />
diff --git a/app/src/main/res/drawable/url_button_start_private.xml b/app/src/main/res/drawable/url_button_start_private.xml
index eb3d6aaaa..0b31d59c9 100644
--- a/app/src/main/res/drawable/url_button_start_private.xml
+++ b/app/src/main/res/drawable/url_button_start_private.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_enabled="false">
         <shape android:shape="rectangle">
             <corners android:bottomLeftRadius="20dp" android:topLeftRadius="20dp" />
diff --git a/app/src/main/res/values/integer.xml b/app/src/main/res/values/integer.xml
deleted file mode 100644
index 5a4a9147f..000000000
--- a/app/src/main/res/values/integer.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Animations -->
-    <integer name="ui_fadeAnimTime">75</integer>
-</resources>
\ No newline at end of file