#289 Reset homescreen rearrange mode on back or home press

app/src/main/java/com/stario/launcher/activities/launcher/Launcher.java

@@ -108,7 +108,10 @@ public void onReceive(Context context, Intent intent) {
         };
 
         homeWatcher = new HomeWatcher(this);
-        homeWatcher.setOnHomePressedListener(() -> setContrastVisibility(View.GONE));
+        homeWatcher.setOnHomePressedListener(() -> {
+            setContrastVisibility(View.GONE);
+            setRearrangeable(false);
+        });
 
         if (Utils.isMinimumSDK(Build.VERSION_CODES.TIRAMISU)) {
             registerReceiver(killReceiver, new IntentFilter(ACTION_KILL_TASK), RECEIVER_EXPORTED);
@@ -148,8 +151,7 @@ public void onReceive(Context context, Intent intent) {
                     .addCallback(this, new OnBackPressedCallback(true) {
                         @Override
                         public void handleOnBackPressed() {
-                            container.setRearrangeable(false);
-                            controller.setControllerEnabled(true);
+                            setRearrangeable(false);
                         }
                     });
         }
@@ -286,8 +288,7 @@ public void onBackEvent(BackEvent event) {
         menu.add(new PopupMenu.Item(resources.getString(R.string.rearrange),
                 ResourcesCompat.getDrawable(resources, R.drawable.ic_move, activity.getTheme()),
                 view -> view.post(() -> {
-                    container.setRearrangeable(true);
-                    controller.setControllerEnabled(false);
+                    setRearrangeable(true);
                     menu.dismiss();
                 })));
 
@@ -425,6 +426,13 @@ private void setContrastVisibility(int visible) {
         }
     }
 
+    private void setRearrangeable(boolean value) {
+        if (controller != null && container != null) {
+            container.setRearrangeable(value);
+            controller.setControllerEnabled(!value);
+        }
+    }
+
     @Override
     protected void onStart() {
         super.onStart();
@@ -436,8 +444,7 @@ protected void onStart() {
     protected void onStop() {
         setContrastVisibility(View.GONE);
 
-        container.setRearrangeable(false);
-        controller.setControllerEnabled(true);
+        setRearrangeable(false);
         homeWatcher.stopWatch();
 
         if (showWhenLocked) {
@@ -501,5 +508,6 @@ protected boolean isAffectedByBackGesture() {
     @SuppressWarnings("deprecation")
     @SuppressLint({"MissingSuperCall", "GestureBackNavigation"})
     public void onBackPressed() {
+        setRearrangeable(false);
     }
 }

app/src/main/java/com/stario/launcher/ui/common/grid/DynamicGridLayout.java

@@ -154,6 +154,10 @@ private boolean isAnimationRunning() {
     }
 
     public void setRearrangeable(boolean rearrangeable) {
+        if (this.isRearrangeable == rearrangeable) {
+            return;
+        }
+
         this.isRearrangeable = rearrangeable;
 
         for (int index = 0; index < getChildCount(); index++) {