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

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

Merge "Launch work lock scrim as clear_top not single_top"

parents f3292540 588a3337

packages/SystemUI/AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -500,7 +500,6 @@ 
                  android:label="@string/accessibility_desc_work_lock"

                  android:permission="android.permission.MANAGE_USERS"

                  android:exported="false"

                  android:launchMode="singleTop"

                  android:excludeFromRecents="true"

                  android:stateNotNeeded="true"

                  android:resumeWhilePausing="true"

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

+2 −3
Original line number Diff line number Diff line
@@ -42,9 +42,8 @@ public class WorkLockActivityController { 
        Intent intent = new Intent(KeyguardManager.ACTION_CONFIRM_DEVICE_CREDENTIAL_WITH_USER)

                .setComponent(new ComponentName(mContext, WorkLockActivity.class))

                .putExtra(Intent.EXTRA_USER_ID, userId)

                .addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS

                        | Intent.FLAG_ACTIVITY_REORDER_TO_FRONT

                        | Intent.FLAG_ACTIVITY_SINGLE_TOP);

                .addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT

                        | Intent.FLAG_ACTIVITY_CLEAR_TOP);



        final ActivityOptions options = ActivityOptions.makeBasic();

        options.setLaunchTaskId(taskId);