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

Commit 096762d6 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 8075fe48: am 78470718: Fix various places that were using the wrong display metrics. 

* commit '8075fe48':
  Fix various places that were using the wrong display metrics.
parents 9b94aa18 8075fe48

services/java/com/android/server/wm/ScreenRotationAnimation.java

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ class ScreenRotationAnimation { 
        mContext = context;

        mDisplay = display;



        display.getMetrics(mDisplayMetrics);

        display.getRealMetrics(mDisplayMetrics);



        Bitmap screenshot = Surface.screenshot(0, 0);
@@ -244,7 +244,7 @@ class ScreenRotationAnimation { 
                break;

        }



        mDisplay.getMetrics(mDisplayMetrics);

        mDisplay.getRealMetrics(mDisplayMetrics);



        // Initialize the animations.  This is a hack, redefining what "parent"

        // means to allow supplying the last and next size.  In this definition

services/java/com/android/server/wm/StrictModeFlash.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ class StrictModeFlash { 


    public StrictModeFlash(Display display, SurfaceSession session) {

        final DisplayMetrics dm = new DisplayMetrics();

        display.getMetrics(dm);

        display.getRealMetrics(dm);



        try {

            mSurface = new Surface(session, 0, "StrictModeFlash", -1, 1, 1, PixelFormat.TRANSLUCENT, 0);

services/java/com/android/server/wm/Watermark.java

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ class Watermark { 


    Watermark(Display display, SurfaceSession session, String[] tokens) {

        final DisplayMetrics dm = new DisplayMetrics();

        display.getMetrics(dm);

        display.getRealMetrics(dm);



        if (false) {

            Log.i(WindowManagerService.TAG, "*********************** WATERMARK");