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

Commit c003fd26 authored by Jason Chiu's avatar Jason Chiu Committed by Automerger Merge Worker
Browse files

Merge "Don't start two pane for singleInstance deep links" into tm-dev am: bd6107d1 

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



Change-Id: Ie56147110734f46528e940b52de69f905680f112
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b0cc0e28 bd6107d1

src/com/android/settings/SettingsActivity.java

+9 −0
Original line number Diff line number Diff line
@@ -466,6 +466,15 @@ public class SettingsActivity extends SettingsBaseActivity 
            return false;

        }



        // If the activity's launch mode is "singleInstance", it can't be embedded in Settings since

        // it will be created in a new task.

        ActivityInfo info = intent.resolveActivityInfo(getPackageManager(),

                PackageManager.MATCH_DEFAULT_ONLY);

        if (info.launchMode == ActivityInfo.LAUNCH_SINGLE_INSTANCE) {

            Log.w(LOG_TAG, "launchMode: singleInstance");

            return false;

        }



        if (intent.getBooleanExtra(EXTRA_IS_FROM_SLICE, false)) {

            // Slice deep link starts the Intent using SubSettingLauncher. Returns true to show

            // 2-pane deep link.