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

Commit ca9897fe authored by mincheli's avatar mincheli
Browse files

Update the drag handle icon of window magnification 

Screenshot:
b/164005577#comment3

Bug: 164005577
Test: manually test
Change-Id: I00c97d9c99f15a85753b2f3a2b2b099832e6701e
parent e9897deb

packages/SystemUI/res/drawable/ic_move.xml→packages/SystemUI/res/drawable/ic_move_magnification.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item>

        <shape android:shape="oval">

        <shape android:shape="rectangle">

            <solid

                android:color="@android:color/black" />

            <size

packages/SystemUI/res/layout/window_magnifier_view.xml

+9 −8
Original line number Diff line number Diff line
@@ -73,8 +73,9 @@ 
        android:id="@+id/drag_handle"

        android:layout_width="@dimen/magnification_drag_view_size"

        android:layout_height="@dimen/magnification_drag_view_size"

        android:layout_margin="@dimen/magnification_outer_border_margin"

        android:layout_gravity="right|bottom"

        android:scaleType="center"

        android:src="@drawable/ic_move" />

        android:src="@drawable/ic_move_magnification"/>



</FrameLayout>
 
 No newline at end of file

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

+9 −1
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold 
    private SurfaceView mMirrorSurfaceView;

    private int mMirrorSurfaceMargin;

    private int mBorderDragSize;

    private int mDragViewSize;

    private int mOuterBorderSize;

    // The boundary of magnification frame.

    private final Rect mMagnificationFrameBoundary = new Rect();
@@ -168,6 +169,8 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold 
                R.dimen.magnification_mirror_surface_margin);

        mBorderDragSize = mResources.getDimensionPixelSize(

                R.dimen.magnification_border_drag_size);

        mDragViewSize = mResources.getDimensionPixelSize(

                R.dimen.magnification_drag_view_size);

        mOuterBorderSize = mResources.getDimensionPixelSize(

                R.dimen.magnification_outer_border_margin);

    }
@@ -307,6 +310,10 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold 
        Region regionInsideDragBorder = new Region(mBorderDragSize, mBorderDragSize,

                mMirrorView.getWidth() - mBorderDragSize,

                mMirrorView.getHeight() - mBorderDragSize);

        Rect dragArea = new Rect(mMirrorView.getWidth() - mDragViewSize - mBorderDragSize,

                mMirrorView.getHeight() - mDragViewSize - mBorderDragSize,

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

        regionInsideDragBorder.op(dragArea, Region.Op.DIFFERENCE);

        return regionInsideDragBorder;

    }
@@ -555,6 +562,7 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold 


    /**

     * Gets the scale.

     *

     * @return {@link Float#NaN} if the window is invisible.

     */

    float getScale() {