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

Commit 3c1e53dd authored by wilsonshih's avatar wilsonshih
Browse files

Use setTaskOverlay to launch ConfirmDeviceCredentialActivity. 

WorkLockActivity is launched as a task overlay activity. If it needs to
launch an activity on top of it, the activity should also be a task
overlay.

Bug: 142853039
Test: Follow the issue description
Test: atest WmTests:ActivityOptionsTest
Change-Id: If4cdc892f608df5337223f70333538e33ff593ca
parent 07d87c03

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