Merge "Remove settings activity from recents at end of PS setup" into main

This commit is contained in:
Joseph Vincent
2024-04-09 22:37:24 +00:00
committed by Android (Google) Code Review

View File

@@ -17,6 +17,7 @@
package com.android.settings.privatespace; package com.android.settings.privatespace;
import android.app.Activity; import android.app.Activity;
import android.app.ActivityManager;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
@@ -39,6 +40,8 @@ import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupcompat.template.FooterButton; import com.google.android.setupcompat.template.FooterButton;
import com.google.android.setupdesign.GlifLayout; import com.google.android.setupdesign.GlifLayout;
import java.util.List;
/** Fragment for the final screen shown on successful completion of private space setup. */ /** Fragment for the final screen shown on successful completion of private space setup. */
public class SetupSuccessFragment extends InstrumentedFragment { public class SetupSuccessFragment extends InstrumentedFragment {
private static final String TAG = "SetupSuccessFragment"; private static final String TAG = "SetupSuccessFragment";
@@ -103,7 +106,7 @@ public class SetupSuccessFragment extends InstrumentedFragment {
accessPrivateSpaceToast(); accessPrivateSpaceToast();
startActivity(allAppsIntent); startActivity(allAppsIntent);
Log.i(TAG, "Private space setup complete"); Log.i(TAG, "Private space setup complete");
activity.finish(); deleteAllTaskAndFinish(activity);
} }
}; };
} }
@@ -118,4 +121,12 @@ public class SetupSuccessFragment extends InstrumentedFragment {
drawable) drawable)
.show(); .show();
} }
private void deleteAllTaskAndFinish(Activity activity) {
ActivityManager activityManager = activity.getSystemService(ActivityManager.class);
List<ActivityManager.AppTask> tasks = activityManager.getAppTasks();
for (var task : tasks) {
task.finishAndRemoveTask();
}
}
} }