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

Commit 3677e44f authored by mincheli's avatar mincheli
Browse files

Update mirror window location when orientation changed 

The postion of mirror window on the screen would be moved when
the device is rotated because of the x and y of layout params
are fixed. To keep mirror window visually unmoved, we have to
update layoutparams of mirror window.

Bug: 147707737
Bug: 146609741
Test: adb shell settings put secure window_magnification 1
Change-Id: I003d578d67c69792c25a580824e933393ef80949
parent 5e29645e

packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnification.java

+4 −1
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ import javax.inject.Singleton; 
 */

@Singleton

public class WindowMagnification extends SystemUI {

    private static final int CONFIG_MASK =

            ActivityInfo.CONFIG_DENSITY | ActivityInfo.CONFIG_ORIENTATION;



    private WindowMagnificationController mWindowMagnificationController;

    private final Handler mHandler;
@@ -49,7 +52,7 @@ public class WindowMagnification extends SystemUI { 
    @Override

    public void onConfigurationChanged(Configuration newConfig) {

        final int configDiff = newConfig.diff(mLastConfiguration);

        if ((configDiff & ActivityInfo.CONFIG_DENSITY) == 0) {

        if ((configDiff & CONFIG_MASK) == 0) {

            return;

        }

        mLastConfiguration.setTo(newConfig);

packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java

+71 −11
Original line number Diff line number Diff line
@@ -20,14 +20,18 @@ import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_M 


import android.annotation.Nullable;

import android.content.Context;

import android.content.pm.ActivityInfo;

import android.content.res.Resources;

import android.graphics.Matrix;

import android.graphics.PixelFormat;

import android.graphics.Point;

import android.graphics.PointF;

import android.graphics.Rect;

import android.graphics.RectF;

import android.graphics.Region;

import android.os.Binder;

import android.os.RemoteException;

import android.util.Log;

import android.view.Display;

import android.view.Gravity;

import android.view.IWindow;
@@ -52,9 +56,13 @@ import com.android.systemui.shared.system.WindowManagerWrapper; 
public class WindowMagnificationController implements View.OnTouchListener, SurfaceHolder.Callback,

        MirrorWindowControl.MirrorWindowDelegate {



    private static final String TAG = "WindowMagnificationController";

    private final Context mContext;

    private final Resources mResources;

    private final Point mDisplaySize = new Point();

    private final int mDisplayId;

    @Surface.Rotation

    private int mRotation;

    private final Rect mMagnificationFrame = new Rect();

    private final SurfaceControl.Transaction mTransaction = new SurfaceControl.Transaction();
@@ -78,6 +86,7 @@ public class WindowMagnificationController implements View.OnTouchListener, Surf 
    private View mMirrorView;

    private SurfaceView mMirrorSurfaceView;

    private int mMirrorSurfaceMargin;

    private int mBorderDragSize;

    private View mOverlayView;

    // The boundary of magnification frame.

    private final Rect mMagnificationFrameBoundary = new Rect();
@@ -90,19 +99,27 @@ public class WindowMagnificationController implements View.OnTouchListener, Surf 
        Display display = mContext.getDisplay();

        display.getRealSize(mDisplaySize);

        mDisplayId = mContext.getDisplayId();

        mRotation = display.getRotation();



        mWm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);



        Resources r = context.getResources();

        mMirrorSurfaceMargin = r.getDimensionPixelSize(R.dimen.magnification_mirror_surface_margin);

        mResources = mContext.getResources();

        mScale = mResources.getInteger(R.integer.magnification_default_scale);

        updateDimensions();



        mScale = r.getInteger(R.integer.magnification_default_scale);

        mMirrorWindowControl = mirrorWindowControl;

        if (mMirrorWindowControl != null) {

            mMirrorWindowControl.setWindowDelegate(this);

        }

    }



    private void updateDimensions() {

        mMirrorSurfaceMargin = mResources.getDimensionPixelSize(

                R.dimen.magnification_mirror_surface_margin);

        mBorderDragSize = mResources.getDimensionPixelSize(

                R.dimen.magnification_border_drag_size);

    }



    /**

     * Creates a magnification window if it doesn't already exist.

     */
@@ -182,11 +199,55 @@ public class WindowMagnificationController implements View.OnTouchListener, Surf 
     * @param configDiff a bit mask of the differences between the configurations

     */

    void onConfigurationChanged(int configDiff) {

        if ((configDiff & ActivityInfo.CONFIG_DENSITY) != 0) {

            updateDimensions();

            // TODO(b/145780606): update toggle button UI.

            if (mMirrorView != null) {

                mWm.removeView(mMirrorView);

                createMirrorWindow();

            }

        } else if ((configDiff & ActivityInfo.CONFIG_ORIENTATION) != 0) {

            onRotate();

        }

    }



    /** Handles MirrorWindow position when the device rotation changed. */

    private void onRotate() {

        Display display = mContext.getDisplay();

        display.getRealSize(mDisplaySize);

        setMagnificationFrameBoundary();



        // Keep MirrorWindow position on the screen unchanged when device rotates 90°

        // clockwise or anti-clockwise.

        final int rotationDegree = getDegreeFromRotation(display.getRotation(), mRotation);

        final Matrix matrix = new Matrix();

        matrix.setRotate(rotationDegree);

        mRotation = display.getRotation();

        if (rotationDegree == 90) {

            matrix.postTranslate(mDisplaySize.x, 0);

        } else if (rotationDegree == 270) {

            matrix.postTranslate(0, mDisplaySize.y);

        } else {

            Log.w(TAG, "Invalid rotation change. " + rotationDegree);

            return;

        }

        // The rect of MirrorView is going to be transformed.

        WindowManager.LayoutParams params =

                (WindowManager.LayoutParams) mMirrorView.getLayoutParams();

        mTmpRect.set(params.x, params.y, params.x + params.width, params.y + params.height);

        final RectF transformedRect = new RectF(mTmpRect);

        matrix.mapRect(transformedRect);

        final int offsetX = (int) transformedRect.left - mTmpRect.left;

        final int offsetY = (int) transformedRect.top - mTmpRect.top;

        moveMirrorWindow(offsetX, offsetY);

    }



    /** Returns the rotation degree change of two {@link Surface.Rotation} */

    private int getDegreeFromRotation(@Surface.Rotation int newRotation,

            @Surface.Rotation int oldRotation) {

        final int rotationDiff = oldRotation - newRotation;

        final int degree = (rotationDiff + 4) % 4 * 90;

        return degree;

    }



    private void createMirrorWindow() {
@@ -245,10 +306,9 @@ public class WindowMagnificationController implements View.OnTouchListener, Surf 
    }



    private Region calculateTapExclude() {

        final int borderDragSize = mContext.getResources().getDimensionPixelSize(

                R.dimen.magnification_border_drag_size);

        Region regionInsideDragBorder = new Region(borderDragSize, borderDragSize,

                mMirrorView.getWidth() - borderDragSize, mMirrorView.getHeight() - borderDragSize);

        Region regionInsideDragBorder = new Region(mBorderDragSize, mBorderDragSize,

                mMirrorView.getWidth() - mBorderDragSize,

                mMirrorView.getHeight() - mBorderDragSize);

        return regionInsideDragBorder;

    }