Fix collapsing logic

[android-x86/packages-apps-Taskbar.git] / app / src / main / java / com / farmerbb / taskbar / util / U.java

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 1ab3795..3175e6b 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/util/U.java
+++ b/app/src/main/java/com/farmerbb/taskbar/util/U.java
@@ -1083,7 +1083,14 @@ public class U {
 
     public static boolean shouldCollapse(Context context) {
         SharedPreferences pref = getSharedPreferences(context);
-        return pref.getBoolean("hide_taskbar", true)
-                && (isChromeOs(context) || !FreeformHackHelper.getInstance().isInFreeformWorkspace());
+        if(pref.getBoolean("hide_taskbar", true)) {
+            if(isChromeOs(context))
+                return true;
+            else {
+                FreeformHackHelper helper = FreeformHackHelper.getInstance();
+                return !helper.isInFreeformWorkspace();
+            }
+        } else
+            return false;
     }
 }