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

Merge "Use setTaskOverlay to launch ConfirmDeviceCredentialActivity."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-11-06 06:39:21 +00:00
committed by Android (Google) Code Review
parent 4bf760b152 3c1e53ddaa
commit a46b9ca083
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/ActivityOptions.java
View File

@@ -1301,8 +1301,8 @@ public class ActivityOptions {
/**
* Set's whether the activity launched with this option should be a task overlay. That is the
* activity will always be the top activity of the task. If {@param canResume} is true, then
* the task will also not be moved to the front of the stack.
* activity will always be the top activity of the task.
* @param canResume {@code false} if the task will also not be moved to the front of the stack.
* @hide
*/
@TestApi

7
packages/SystemUI/src/com/android/systemui/keyguard/WorkLockActivity.java
View File

@@ -175,7 +175,12 @@ public class WorkLockActivity extends Activity {
credential.putExtra(EXTRA_FROM_WORK_LOCK_ACTIVITY, true);
}
startActivityForResult(credential, REQUEST_CODE_CONFIRM_CREDENTIALS);
final ActivityOptions launchOptions = ActivityOptions.makeBasic();
launchOptions.setLaunchTaskId(getTaskId());
launchOptions.setTaskOverlay(true /* taskOverlay */, true /* canResume */);
startActivityForResult(credential, REQUEST_CODE_CONFIRM_CREDENTIALS,
launchOptions.toBundle());
}
@Override