Properly close DummyActivity on Android 10+

farmerbb · Sep 12, 2024 · 739ca46 · 739ca46
1 parent 8fd3933
commit 739ca46
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/DashboardActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/DashboardActivity.java
@@ -170,7 +170,7 @@ public boolean dispatchKeyShortcutEvent(KeyEvent event) {
         return super.dispatchKeyShortcutEvent(event);
     }
 
- // @Override
+    @Override
     public void onTopResumedActivityChanged(boolean isTopResumedActivity) {
         if(!isTopResumedActivity)
             performOnPauseLogic();

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/DimScreenActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/DimScreenActivity.java
@@ -142,7 +142,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     @Override
     public void onBackPressed() {}
 
-    // @Override
+    @Override
     public void onTopResumedActivityChanged(boolean isTopResumedActivity) {
         isTopResumed = isTopResumedActivity;
         dimScreen(true);

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/DummyActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/DummyActivity.java
@@ -124,4 +124,11 @@ protected void onPause() {
         if(finishOnPause)
             finish();
     }
+
+    @Override
+    public void onTopResumedActivityChanged(boolean isTopResumedActivity) {
+        if(isTopResumedActivity && finishOnPause) {
+            finish();
+        }
+    }
 }
diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/HomeActivityDelegate.java b/app/src/main/java/com/farmerbb/taskbar/activity/HomeActivityDelegate.java
@@ -1110,7 +1110,7 @@ private void setOnHomeScreen(boolean value) {
             helper.setOnPrimaryHomeScreen(value);
     }
 
- // @Override
+    @Override
     public void onTopResumedActivityChanged(boolean isTopResumedActivity) {
         if(isTopResumedActivity)
             performOnResumeLogic();