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

Commit a9ea2557 authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Automerger Merge Worker
Browse files

Merge "Close shade when opening MediaProjectionAppSelectorActivity" into udc-qpr-dev am: 35fbd3d9 

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



Change-Id: Ib8331565395a0451f627644623dab860ec409918
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bf6d07c0 35fbd3d9

packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java

+7 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.app.IWallpaperManager; 
import android.app.KeyguardManager;

import android.app.NotificationManager;

import android.app.StatsManager;

import android.app.StatusBarManager;

import android.app.UiModeManager;

import android.app.WallpaperManager;

import android.app.admin.DevicePolicyManager;
@@ -680,4 +681,10 @@ public class FrameworkServicesModule { 
    static TextClassificationManager provideTextClassificationManager(Context context) {

        return context.getSystemService(TextClassificationManager.class);

    }



    @Provides

    @Singleton

    static StatusBarManager provideStatusBarManager(Context context) {

        return context.getSystemService(StatusBarManager.class);

    }

}

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

+7 −1
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.app.StatusBarManager;

import android.content.Context;

import android.content.DialogInterface;

import android.content.Intent;
@@ -72,6 +73,7 @@ public class MediaProjectionPermissionActivity extends Activity 


    private final FeatureFlags mFeatureFlags;

    private final Lazy<ScreenCaptureDevicePolicyResolver> mScreenCaptureDevicePolicyResolver;

    private final StatusBarManager mStatusBarManager;



    private String mPackageName;

    private int mUid;
@@ -87,9 +89,11 @@ public class MediaProjectionPermissionActivity extends Activity 


    @Inject

    public MediaProjectionPermissionActivity(FeatureFlags featureFlags,

            Lazy<ScreenCaptureDevicePolicyResolver> screenCaptureDevicePolicyResolver) {

            Lazy<ScreenCaptureDevicePolicyResolver> screenCaptureDevicePolicyResolver,

            StatusBarManager statusBarManager) {

        mFeatureFlags = featureFlags;

        mScreenCaptureDevicePolicyResolver = screenCaptureDevicePolicyResolver;

        mStatusBarManager = statusBarManager;

    }



    @Override
@@ -311,6 +315,8 @@ public class MediaProjectionPermissionActivity extends Activity 
                // WM Shell running inside.

                mUserSelectingTask = true;

                startActivityAsUser(intent, UserHandle.of(ActivityManager.getCurrentUser()));

                // close shade if it's open

                mStatusBarManager.collapsePanels();

            }

        } catch (RemoteException e) {

            Log.e(TAG, "Error granting projection permission", e);