Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dd56aaa authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove FLAG_ACTIVITY_NEW_TASk when there is transition" into sc-dev am: 970e76fd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880238

Change-Id: Ia28bb9746cb2b77a856d9ee90ab2132dcf57d07f
parents bf101173 970e76fd

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);

    }