OSDN Git Service

Revert "Explicitly tie showing / hiding Taskbar automatically on the home screen...
authorBraden Farmer <farmerbb@gmail.com>
Mon, 16 Mar 2020 03:59:44 +0000 (21:59 -0600)
committerBraden Farmer <farmerbb@gmail.com>
Mon, 16 Mar 2020 03:59:44 +0000 (21:59 -0600)
This reverts commit 6e3da5a8e4951302d64f9dbb4d5e4fbc566bf8d5.

app/src/main/java/com/farmerbb/taskbar/activity/HomeActivityDelegate.java

index 4027d7b..d4f5360 100644 (file)
@@ -404,8 +404,9 @@ public class HomeActivityDelegate extends AppCompatActivity implements UIHost {
                     finish();
                 } catch (ActivityNotFoundException e) { /* Gracefully fail */ }
             }
-        } else if(U.shouldCollapse(this, false))
-            LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.SHOW_TASKBAR"));
+        } else {
+            LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.TEMP_SHOW_TASKBAR"));
+        }
     }
 
     @Override
@@ -473,8 +474,7 @@ public class HomeActivityDelegate extends AppCompatActivity implements UIHost {
             pref.edit().putBoolean("taskbar_active", false).apply();
 
         // Show the Taskbar temporarily, as nothing else will be visible on screen
-        if(U.shouldCollapse(this, false))
-            new Handler().postDelayed(() -> LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.SHOW_TASKBAR")), 100);
+        new Handler().postDelayed(() -> LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.TEMP_SHOW_TASKBAR")), 100);
     }
 
     private void startFreeformHack() {
@@ -491,9 +491,7 @@ public class HomeActivityDelegate extends AppCompatActivity implements UIHost {
         SharedPreferences pref = U.getSharedPreferences(this);
         if(!U.canBootToFreeform(this)) {
             setOnHomeScreen(false);
-
-            if(U.shouldCollapse(this, false))
-                LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.HIDE_TASKBAR"));
+            LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.TEMP_HIDE_TASKBAR"));
 
             if(this instanceof SecondaryHomeActivity) {
                 if(taskbarController != null) taskbarController.onDestroyHost(this);