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

Commit f2580c5d authored by Steve McKay's avatar Steve McKay Committed by Android (Google) Code Review
Browse files

Merge "Create new windows on *other* side in multi-window mode."

parents f7d6fa4c a7e923c5

packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java

+10 −2
Original line number Diff line number Diff line
@@ -16,12 +16,11 @@ 


package com.android.documentsui;



import static com.android.documentsui.OperationDialogFragment.DIALOG_TYPE_UNKNOWN;

import static com.android.documentsui.Shared.DEBUG;

import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_NONE;

import static com.android.internal.util.Preconditions.checkArgument;

import static com.android.internal.util.Preconditions.checkState;

import static com.android.documentsui.OperationDialogFragment.DialogType;

import static com.android.documentsui.OperationDialogFragment.DIALOG_TYPE_UNKNOWN;



import android.app.Activity;

import android.app.FragmentManager;
@@ -45,6 +44,7 @@ import android.widget.BaseAdapter; 
import android.widget.Spinner;

import android.widget.Toolbar;



import com.android.documentsui.OperationDialogFragment.DialogType;

import com.android.documentsui.RecentsProvider.ResumeColumns;

import com.android.documentsui.dirlist.DirectoryFragment;

import com.android.documentsui.model.DocumentInfo;
@@ -287,6 +287,14 @@ public class FilesActivity extends BaseActivity { 
        Metrics.logMultiWindow(this);

        Intent intent = LauncherActivity.createLaunchIntent(this);

        intent.putExtra(Shared.EXTRA_STACK, (Parcelable) mState.stack);



        // With new multi-window mode we have to pick how we are launched.

        // By default we'd be launched in-place above the existing app.

        // By setting launch-to-side ActivityManager will open us to side.

        if (inMultiWindowMode()) {

            intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_TO_SIDE);

        }



        startActivity(intent);

    }

packages/DocumentsUI/src/com/android/documentsui/LauncherActivity.java

+4 −1
Original line number Diff line number Diff line
@@ -74,6 +74,9 @@ public class LauncherActivity extends Activity { 


    private void startTask() {

        Intent intent = createLaunchIntent(this);



        // Forward any flags from the original intent.

        intent.setFlags(getIntent().getFlags());

        if (DEBUG) Log.d(TAG, "Starting new task > " + intent.getData());

        startActivity(intent);

    }
@@ -84,7 +87,7 @@ public class LauncherActivity extends Activity { 
        startActivity(intent);

    }



    static Intent createLaunchIntent(Context context) {

    static final Intent createLaunchIntent(Context context) {

        Intent intent = new Intent(context, FilesActivity.class);

        intent.setData(buildLaunchUri());

        return intent;