Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow setting fullscreen stack as target via adb shell" into nyc-dev

Browse Source
This commit is contained in:
Andrii Kulian
2016-04-27 02:13:10 +00:00
committed by Android (Google) Code Review
parent 24b6e2bcc8 435ce5ff1c
commit a4ab6a0683
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmds/am/src/com/android/commands/am/Am.java
View File

@@ -18,10 +18,10 @@
package com.android.commands.am; package com.android.commands.am;
import static android.app.ActivityManager.StackId.DOCKED_STACK_ID;
import static android.app.ActivityManager.RESIZE_MODE_SYSTEM; import static android.app.ActivityManager.RESIZE_MODE_SYSTEM;
import static android.app.ActivityManager.RESIZE_MODE_USER; import static android.app.ActivityManager.RESIZE_MODE_USER;
import static android.app.ActivityManager.StackId.FULLSCREEN_WORKSPACE_STACK_ID; import static android.app.ActivityManager.StackId.DOCKED_STACK_ID;
import static android.app.ActivityManager.StackId.INVALID_STACK_ID;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.ActivityManager.StackInfo; import android.app.ActivityManager.StackInfo;
@@ -484,7 +484,7 @@ public class Am extends BaseCommand {
mSamplingInterval = 0; mSamplingInterval = 0;
mAutoStop = false; mAutoStop = false;
mUserId = defUser; mUserId = defUser;
mStackId = FULLSCREEN_WORKSPACE_STACK_ID; mStackId = INVALID_STACK_ID;
return Intent.parseCommandArgs(mArgs, new Intent.CommandOptionHandler() { return Intent.parseCommandArgs(mArgs, new Intent.CommandOptionHandler() {
@Override @Override
@@ -622,7 +622,7 @@ public class Am extends BaseCommand {
int res; int res;
final long startTime = SystemClock.uptimeMillis(); final long startTime = SystemClock.uptimeMillis();
ActivityOptions options = null; ActivityOptions options = null;
if (mStackId != FULLSCREEN_WORKSPACE_STACK_ID) { if (mStackId != INVALID_STACK_ID) {
options = ActivityOptions.makeBasic(); options = ActivityOptions.makeBasic();
options.setLaunchStackId(mStackId); options.setLaunchStackId(mStackId);
} }