Merge "Remove FLAG_ACTIVITY_NEW_TASk when there is transition" into sc-dev (970e76fd) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/core/SubSettingLauncher.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import androidx.fragment.app.Fragment;

		import com.android.settings.SettingsActivity;
		import com.android.settings.SubSettings;
		import com.android.settings.Utils;
		import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
		import com.android.settingslib.transition.SettingsTransitionHelper.TransitionType;

		@@ -181,8 +182,10 @@ public class SubSettingLauncher {

		@VisibleForTesting
		void launchAsUser(Intent intent, UserHandle userHandle) {
		if (!Utils.isPageTransitionEnabled(mContext)) {
		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
		intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
		}
		mContext.startActivityAsUser(intent, userHandle);
		}