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

Commit 5e5fbb90 authored by Daniel Hsieh's avatar Daniel Hsieh Committed by Automerger Merge Worker
Browse files

Merge changes from topics "presubmit-am-6d6a4b4f29394bb498818c2f4488d08d",... 

Merge changes from topics "presubmit-am-6d6a4b4f29394bb498818c2f4488d08d", "presubmit-am-b0e37416e8c743989854206f0e1f2acb" into tm-dev am: 6fbd9e77

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17041346

Change-Id: I78d8b4aabd370a93a295175bf8bf5093c88f7445
parents 5048c8e1 6fbd9e77

core/java/android/view/accessibility/IWindowMagnificationConnectionCallback.aidl

+2 −4
Original line number Diff line number Diff line
@@ -68,12 +68,10 @@ import android.graphics.Rect; 
    void onAccessibilityActionPerformed(int displayId);



    /**

     * Called when the user is performing dragging gesture. It is started after the offset

     * between the down location and the move event location exceed

     * {@link ViewConfiguration#getScaledTouchSlop()}.

     * Called when the user is performing move action.

     *

     * @param displayId The logical display id.

     */

    void onDrag(int displayId);

    void onMove(int displayId);



}

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

+2 −2
Original line number Diff line number Diff line
@@ -221,9 +221,9 @@ public class WindowMagnification extends CoreStartable implements WindowMagnifie 
    }



    @Override

    public void onDrag(int displayId) {

    public void onMove(int displayId) {

        if (mWindowMagnificationConnectionImpl != null) {

            mWindowMagnificationConnectionImpl.onDrag(displayId);

            mWindowMagnificationConnectionImpl.onMove(displayId);

        }

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -150,10 +150,10 @@ class WindowMagnificationConnectionImpl extends IWindowMagnificationConnection.S 
        }

    }



    void onDrag(int displayId) {

    void onMove(int displayId) {

        if (mConnectionCallback != null) {

            try {

                mConnectionCallback.onDrag(displayId);

                mConnectionCallback.onMove(displayId);

            } catch (RemoteException e) {

                Log.e(TAG, "Failed to inform taking control by a user", e);

            }

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

+2 −2
Original line number Diff line number Diff line
@@ -852,6 +852,7 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold 
    @Override

    public void move(int xOffset, int yOffset) {

        moveWindowMagnifier(xOffset, yOffset);

        mWindowMagnifierCallback.onMove(mDisplayId);

    }



    /**
@@ -1045,8 +1046,7 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold 


    @Override

    public boolean onDrag(float offsetX, float offsetY) {

        moveWindowMagnifier(offsetX, offsetY);

        mWindowMagnifierCallback.onDrag(mDisplayId);

        move((int) offsetX, (int) offsetY);

        return true;

    }

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

+2 −5
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.accessibility;



import android.graphics.Rect;

import android.view.ViewConfiguration;



/**

 * A callback to inform {@link com.android.server.accessibility.AccessibilityManagerService} about
@@ -56,11 +55,9 @@ interface WindowMagnifierCallback { 
    void onAccessibilityActionPerformed(int displayId);



    /**

     * Called when the user is performing dragging gesture. It is started after the offset

     * between the down location and the move event location exceed

     * {@link ViewConfiguration#getScaledTouchSlop()}.

     * Called when the user is performing a move action.

     *

     * @param displayId The logical display id.

     */

    void onDrag(int displayId);

    void onMove(int displayId);

}