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

Commit a46b9ca0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use setTaskOverlay to launch ConfirmDeviceCredentialActivity."

parents 4bf760b1 3c1e53dd

core/java/android/app/ActivityOptions.java

+2 −2
Original line number Diff line number Diff line
@@ -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

packages/SystemUI/src/com/android/systemui/keyguard/WorkLockActivity.java

+6 −1
Original line number Diff line number Diff line
@@ -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