From b35fa82b3de383d42825da5062dd58e1f308a1dc Mon Sep 17 00:00:00 2001
From: josephpv <josephpv@google.com>
Date: Mon, 15 Apr 2024 10:54:05 +0000
Subject: [PATCH] Launch full screen private space setup on Fold when unfolded

This change takes care to launch the private space setup in whole screen
on Fold device whenever the device is unfolded.

Screenshot: go/ss/6D9EwMaLp7LFbsH.png
Recording: b/324260315

Bug: 324260315
Test: Manual
Change-Id: I5bc7b7c8fbc880b6274ddd287a8a169b49843f1b
---
 .../activityembedding/ActivityEmbeddingRulesController.java | 2 ++
 .../settings/privatespace/SetupPreFinishDelayFragment.java  | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
index a068a0852eb..f4c928cc904 100644
--- a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
+++ b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
@@ -50,6 +50,7 @@ import com.android.settings.homepage.DeepLinkHomepageActivityInternal;
 import com.android.settings.homepage.SettingsHomepageActivity;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.password.ChooseLockPattern;
+import com.android.settings.privatespace.PrivateSpaceSetupActivity;
 import com.android.settings.remoteauth.RemoteAuthActivity;
 import com.android.settings.remoteauth.RemoteAuthActivityInternal;
 
@@ -264,6 +265,7 @@ public class ActivityEmbeddingRulesController {
         addActivityFilter(activityFilters, RemoteAuthActivity.class);
         addActivityFilter(activityFilters, RemoteAuthActivityInternal.class);
         addActivityFilter(activityFilters, ChooseLockPattern.class);
+        addActivityFilter(activityFilters, PrivateSpaceSetupActivity.class);
         String action = mContext.getString(R.string.config_avatar_picker_action);
         addActivityFilter(activityFilters, new Intent(action));
 
diff --git a/src/com/android/settings/privatespace/SetupPreFinishDelayFragment.java b/src/com/android/settings/privatespace/SetupPreFinishDelayFragment.java
index aee8512ec9b..9d04e7900aa 100644
--- a/src/com/android/settings/privatespace/SetupPreFinishDelayFragment.java
+++ b/src/com/android/settings/privatespace/SetupPreFinishDelayFragment.java
@@ -123,6 +123,12 @@ public class SetupPreFinishDelayFragment extends InstrumentedFragment {
         sHandler.postDelayed(mRunnable, MAX_DELAY_BEFORE_SETUP_FINISH);
     }
 
+    @Override
+    public void onDestroy() {
+        sHandler.removeCallbacks(mRunnable);
+        super.onDestroy();
+    }
+
     @Override
     public int getMetricsCategory() {
         return SettingsEnums.PRIVATE_SPACE_SETUP_PRE_FINISH;