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

Commit 4fd9bddb authored by Nick Chameyev's avatar Nick Chameyev Committed by Automerger Merge Worker
Browse files

Merge "[MediaProjection] Finish permission activity if dialog dismissed or... 

Merge "[MediaProjection] Finish permission activity if dialog dismissed or cancelled" into tm-qpr-dev am: 4d6d94f8

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



Change-Id: If8ccaa2563c29294a825738f2213abb9fd886605
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 41f355aa 4d6d94f8

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

+7 −5
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ import javax.inject.Inject; 
import dagger.Lazy;



public class MediaProjectionPermissionActivity extends Activity

        implements DialogInterface.OnClickListener, DialogInterface.OnCancelListener {

        implements DialogInterface.OnClickListener {

    private static final String TAG = "MediaProjectionPermissionActivity";

    private static final float MAX_APP_NAME_SIZE_PX = 500f;

    private static final String ELLIPSIS = "\u2026";
@@ -215,7 +215,8 @@ public class MediaProjectionPermissionActivity extends Activity 
        SystemUIDialog.applyFlags(dialog);

        SystemUIDialog.setDialogSize(dialog);



        dialog.setOnCancelListener(this);

        dialog.setOnCancelListener(this::onDialogDismissedOrCancelled);

        dialog.setOnDismissListener(this::onDialogDismissedOrCancelled);

        dialog.create();

        dialog.getButton(DialogInterface.BUTTON_POSITIVE).setFilterTouchesWhenObscured(true);
@@ -283,10 +284,11 @@ public class MediaProjectionPermissionActivity extends Activity 
        return intent;

    }



    @Override

    public void onCancel(DialogInterface dialog) {

    private void onDialogDismissedOrCancelled(DialogInterface dialogInterface) {

        if (!isFinishing()) {

            finish();

        }

    }



    private boolean isPartialScreenSharingEnabled() {

        return mFeatureFlags.isEnabled(Flags.WM_ENABLE_PARTIAL_SCREEN_SHARING);