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

Commit 6ad68083 authored by Wes Okuhara's avatar Wes Okuhara Committed by Android (Google) Code Review
Browse files

Merge "Screen capture: Allow showForAllUsers for ScreenCaptureActivity" into main

parents 92fc94e2 58066cc0

packages/SystemUI/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -543,6 +543,7 @@ 
            android:exported="false"

            android:finishOnCloseSystemDialogs="true"

            android:launchMode="singleInstance"

            android:showForAllUsers="true"

            android:theme="@style/ScreenCapture" />



        <service android:name=".screenrecord.service.ScreenRecordingService" />

packages/SystemUI/src/com/android/systemui/qs/tiles/ScreenRecordTile.java

+3 −1
Original line number Diff line number Diff line
@@ -132,10 +132,12 @@ public class ScreenRecordTile extends QSTileImpl<QSTile.BooleanState> 
    @Override

    protected void handleClick(@Nullable Expandable expandable) {

        if (mScreenCaptureRecordFeaturesInteractor.getShouldShowNewToolbar()) {

            UserHandle userHandle = UserHandle.of(getCurrentTileUser());



            final Intent intent = new Intent(mContext, ScreenCaptureActivity.class);

            // TODO(b/412723197): pass actual params here.

            new ScreenCaptureActivityIntentParameters(ScreenCaptureType.RECORD, false, null, null,

                    UserHandle.CURRENT, 0

                    userHandle, 0

            ).fillIntent(intent);

            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);

            mActivityStarter.postQSRunnableDismissingKeyguard(

packages/SystemUI/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/interactor/ScreenRecordTileUserActionInteractor.kt

+1 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.systemui.qs.tiles.impl.screenrecord.domain.interactor 
import android.content.Context

import android.content.Intent

import android.media.projection.StopReason

import android.os.UserHandle

import android.util.Log

import com.android.internal.jank.InteractionJankMonitor

import com.android.systemui.animation.DialogCuj
@@ -77,7 +76,7 @@ constructor( 
                                isUserConsentRequired = false,

                                resultReceiver = null,

                                mediaProjection = null,

                                hostAppUserHandle = UserHandle.CURRENT,

                                hostAppUserHandle = user,

                                hostAppUid = 0,

                            )

                            .fillIntent(intent)