Fixes for disabling activity animations

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
index a9b478f..c79fd3c 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
@@ -669,8 +669,10 @@ public class ContextMenuActivity extends PreferenceActivity implements Preferenc
             }
         }
 
+        SharedPreferences pref = U.getSharedPreferences(this);
+
         super.finish();
-        if(showStartMenu)
+        if(showStartMenu || pref.getBoolean("disable_animations", false))
             overridePendingTransition(0, 0);
     }
 

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java b/app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java
index 4cc9757..d795589 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java
@@ -97,6 +97,7 @@ public class InvisibleActivityFreeform extends Activity {
 
             proceedWithOnCreate = false;
             super.finish();
+            overridePendingTransition(0, 0);
         }
 
         if(proceedWithOnCreate) {

diff --git a/app/src/main/java/com/farmerbb/taskbar/util/U.java b/app/src/main/java/com/farmerbb/taskbar/util/U.java
index 8519d47..8c3f452 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/util/U.java
+++ b/app/src/main/java/com/farmerbb/taskbar/util/U.java
@@ -281,6 +281,8 @@ public class U {
                 && FreeformHackHelper.getInstance().isInFreeformWorkspace()
                 && MenuHelper.getInstance().isContextMenuOpen();
 
+        boolean noAnimation = pref.getBoolean("disable_animations", false);
+
         if(hasFreeformSupport(context)
                 && pref.getBoolean("freeform_hack", false)
                 && (!helper.isInFreeformWorkspace() || specialLaunch)) {
@@ -290,7 +292,7 @@ public class U {
                 new Handler().postDelayed(runnable, helper.isFreeformHackActive() ? 0 : 100);
             }, launchedFromTaskbar ? 0 : 100);
         } else
-            runnable.run();
+            new Handler().postDelayed(runnable, !launchedFromTaskbar && noAnimation ? 100 : 0);
     }
 
     public static void startFreeformHack(Context context) {