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

Commit 9c1b7ba2 authored by Mark Renouf's avatar Mark Renouf Committed by Android (Google) Code Review
Browse files

Merge "Remove WindowContext, use window binder token"

parents a2864202 b2343da9

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -38,6 +38,7 @@ import android.graphics.Rect; 
import android.hardware.display.DisplayManager;

import android.hardware.display.DisplayManager;

import android.media.MediaActionSound;

import android.media.MediaActionSound;

import android.net.Uri;

import android.net.Uri;

import android.os.Binder;

import android.os.Handler;

import android.os.Handler;

import android.os.IBinder;

import android.os.IBinder;

import android.os.Looper;

import android.os.Looper;
@@ -143,6 +144,7 @@ public class ScreenshotController { 
    private final AccessibilityManager mAccessibilityManager;

    private final AccessibilityManager mAccessibilityManager;

    private final MediaActionSound mCameraSound;

    private final MediaActionSound mCameraSound;





    private final Binder mWindowToken;

    private ScreenshotView mScreenshotView;

    private ScreenshotView mScreenshotView;

    private Bitmap mScreenBitmap;

    private Bitmap mScreenBitmap;

    private SaveImageInBackgroundTask mSaveInBgTask;

    private SaveImageInBackgroundTask mSaveInBgTask;
@@ -178,13 +180,9 @@ public class ScreenshotController { 
        mNotificationsController = screenshotNotificationsController;

        mNotificationsController = screenshotNotificationsController;

        mUiEventLogger = uiEventLogger;

        mUiEventLogger = uiEventLogger;





        // Create a visual (Window) context

        // After this, our windowToken is available from mContext.getActivityToken()

        final DisplayManager dm = requireNonNull(context.getSystemService(DisplayManager.class));

        final DisplayManager dm = requireNonNull(context.getSystemService(DisplayManager.class));

        mDisplay = dm.getDisplay(DEFAULT_DISPLAY);

        mDisplay = dm.getDisplay(DEFAULT_DISPLAY);

        Context displayContext = context.createDisplayContext(mDisplay);

        mContext = context.createDisplayContext(mDisplay);

        mContext = new WindowContext(displayContext, WindowManager.LayoutParams.TYPE_SCREENSHOT,

                null);

        mWindowManager = mContext.getSystemService(WindowManager.class);

        mWindowManager = mContext.getSystemService(WindowManager.class);





        mAccessibilityManager = AccessibilityManager.getInstance(mContext);

        mAccessibilityManager = AccessibilityManager.getInstance(mContext);
@@ -194,6 +192,7 @@ public class ScreenshotController { 
        mInDarkMode = config.isNightModeActive();

        mInDarkMode = config.isNightModeActive();

        mDirectionLTR = config.getLayoutDirection() == View.LAYOUT_DIRECTION_LTR;

        mDirectionLTR = config.getLayoutDirection() == View.LAYOUT_DIRECTION_LTR;

        mOrientationPortrait = config.orientation == ORIENTATION_PORTRAIT;

        mOrientationPortrait = config.orientation == ORIENTATION_PORTRAIT;

        mWindowToken = new Binder("ScreenshotController");





        // Setup the window that we are going to use

        // Setup the window that we are going to use

        mWindowLayoutParams = new WindowManager.LayoutParams(

        mWindowLayoutParams = new WindowManager.LayoutParams(
@@ -210,6 +209,7 @@ public class ScreenshotController { 
        mWindowLayoutParams.layoutInDisplayCutoutMode =

        mWindowLayoutParams.layoutInDisplayCutoutMode =

                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;

                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;

        mWindowLayoutParams.setFitInsetsTypes(0 /* types */);

        mWindowLayoutParams.setFitInsetsTypes(0 /* types */);

        mWindowLayoutParams.token = mWindowToken;





        mDisplayMetrics = new DisplayMetrics();

        mDisplayMetrics = new DisplayMetrics();

        mDisplay.getRealMetrics(mDisplayMetrics);

        mDisplay.getRealMetrics(mDisplayMetrics);