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

Commit 098dbaa2 authored by Christian Göllner's avatar Christian Göllner Committed by Automerger Merge Worker
Browse files

Merge "Fix media projection permission dialog too wide when in split screen"... 

Merge "Fix media projection permission dialog too wide when in split screen" into udc-dev am: 0b657732 am: 16c936b9 am: d1f24382

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23389500



Change-Id: I5ab0f5c18af09ba9f1103d1719af58e77f1712ee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 80ef46fd d1f24382

packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java

+10 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.annotation.Nullable; 
import android.app.Activity;

import android.app.ActivityManager;

import android.app.AlertDialog;

import android.content.Context;

import android.content.DialogInterface;

import android.content.Intent;

import android.content.pm.ApplicationInfo;
@@ -203,14 +204,17 @@ public class MediaProjectionPermissionActivity extends Activity 
            dialogTitle = getString(R.string.media_projection_dialog_title, appName);

        }



        // Using application context for the dialog, instead of the activity context, so we get

        // the correct screen width when in split screen.

        Context dialogContext = getApplicationContext();

        if (isPartialScreenSharingEnabled()) {

            mDialog = new MediaProjectionPermissionDialog(this, () -> {

            mDialog = new MediaProjectionPermissionDialog(dialogContext, () -> {

                ScreenShareOption selectedOption =

                        ((MediaProjectionPermissionDialog) mDialog).getSelectedScreenShareOption();

                grantMediaProjectionPermission(selectedOption.getMode());

            }, () -> finish(RECORD_CANCEL, /* projection= */ null), appName);

        } else {

            AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this,

            AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(dialogContext,

                    R.style.Theme_SystemUI_Dialog)

                    .setTitle(dialogTitle)

                    .setIcon(R.drawable.ic_media_projection_permission)
@@ -263,7 +267,10 @@ public class MediaProjectionPermissionActivity extends Activity 
        final UserHandle hostUserHandle = getHostUserHandle();

        if (mScreenCaptureDevicePolicyResolver.get()

                .isScreenCaptureCompletelyDisabled(hostUserHandle)) {

            AlertDialog dialog = new ScreenCaptureDisabledDialog(this);

            // Using application context for the dialog, instead of the activity context, so we get

            // the correct screen width when in split screen.

            Context dialogContext = getApplicationContext();

            AlertDialog dialog = new ScreenCaptureDisabledDialog(dialogContext);

            setUpDialog(dialog);

            dialog.show();

            return true;