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

Commit 83474f5b authored by Michael Kolb's avatar Michael Kolb Committed by Android Git Automerger
Browse files

am 0fc5f869: am e597d5f9: Merge "Use rotation to position circular display... 

am 0fc5f869: am e597d5f9: Merge "Use rotation to position circular display mask" into klp-modular-dev

* commit '0fc5f869':
  Use rotation to position circular display mask
parents 1c299031 0fc5f869

services/core/java/com/android/server/wm/CircularDisplayMask.java

+23 −3
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.graphics.Color; 
import android.graphics.Paint;

import android.graphics.PixelFormat;

import android.graphics.Rect;

import android.util.Log;

import android.view.Display;

import android.view.Surface;

import android.view.Surface.OutOfResourcesException;
@@ -40,6 +39,7 @@ class CircularDisplayMask { 
    private int mLastDH;

    private boolean mDrawNeeded;

    private Paint mPaint;

    private int mRotation;



    public CircularDisplayMask(Display display, SurfaceSession session, int zOrder) {

        SurfaceControl ctrl = null;
@@ -78,7 +78,26 @@ class CircularDisplayMask { 
        if (c == null) {

            return;

        }

        c.drawCircle(160, 160, 160, mPaint);

        int cx = 160;

        int cy = 160;

        switch (mRotation) {

            case Surface.ROTATION_0:

            case Surface.ROTATION_90:

                // chin bottom or right

                cx = 160;

                cy = 160;

                break;

            case Surface.ROTATION_180:

                // chin top

                cx = 160;

                cy = 145;

                break;

            case Surface.ROTATION_270:

                cx = 145;

                cy = 160;

                break;

        }

        c.drawCircle(cx, cy, 160, mPaint);



        mSurface.unlockCanvasAndPost(c);

    }
@@ -97,7 +116,7 @@ class CircularDisplayMask { 
        }

    }



    void positionSurface(int dw, int dh) {

    void positionSurface(int dw, int dh, int rotation) {

        if (mLastDW == dw && mLastDH == dh) {

            return;

        }
@@ -105,6 +124,7 @@ class CircularDisplayMask { 
        mLastDH = dh;

        mSurfaceControl.setSize(dw, dh);

        mDrawNeeded = true;

        mRotation = rotation;

    }



}

services/core/java/com/android/server/wm/WindowManagerService.java

+4 −4
Original line number Diff line number Diff line
@@ -287,8 +287,6 @@ public class WindowManagerService extends IWindowManager.Stub 
    private static final String DENSITY_OVERRIDE = "ro.config.density_override";

    private static final String SIZE_OVERRIDE = "ro.config.size_override";



    private static final String SCREEN_CIRCULAR = "ro.display.circular";



    private static final int MAX_SCREENSHOT_RETRIES = 3;



    final private KeyguardDisableHandler mKeyguardDisableHandler;
@@ -5489,7 +5487,9 @@ public class WindowManagerService extends IWindowManager.Stub 
    }



    public void showCircularDisplayMaskIfNeeded() {

        if (SystemProperties.getBoolean(SCREEN_CIRCULAR, false)) {

        // we're fullscreen and not hosted in an ActivityView

        if (mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_windowIsRound)) {

            mH.sendMessage(mH.obtainMessage(H.SHOW_DISPLAY_MASK));

        }

    }
@@ -9001,7 +9001,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                mStrictModeFlash.positionSurface(defaultDw, defaultDh);

            }

            if (mCircularDisplayMask != null) {

                mCircularDisplayMask.positionSurface(defaultDw, defaultDh);

                mCircularDisplayMask.positionSurface(defaultDw, defaultDh, mRotation);

            }



            boolean focusDisplayed = false;