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

Commit ed2f7d4b authored by mincheli's avatar mincheli
Browse files

Notifies showing magnification switch when the touch interaction starts or ends 

In the previous design, we notify syetem UI that magnification scale
is changed and it is time to show the magnification switch button.
While the new UX behavior is changed now, we want system UI get
the notification whenever a user touch interaction on the screen starts,
ends  or cancels when the magnification is activated.
Doc: go/window-magnify-ux ,page3

Bug: 172631612
Test: atest AccessibilityManagerServiceTest FullScreenMagnificationGestureHandlerTest
  MagnificationControllerTest WindowMagnificationGestureHandlerTest
Change-Id: Id3243702e8edea98da5c1230fd8d74973f002377
parent fe1579e2

services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandler.java

+2 −2
Original line number Diff line number Diff line
@@ -141,12 +141,12 @@ public class FullScreenMagnificationGestureHandler extends MagnificationGestureH 


    public FullScreenMagnificationGestureHandler(Context context,

            FullScreenMagnificationController fullScreenMagnificationController,

            ScaleChangedListener listener,

            Callback callback,

            boolean detectTripleTap,

            boolean detectShortcutTrigger,

            @NonNull WindowMagnificationPromptController promptController,

            int displayId) {

        super(displayId, detectTripleTap, detectShortcutTrigger, listener);

        super(displayId, detectTripleTap, detectShortcutTrigger, callback);

        if (DEBUG_ALL) {

            Log.i(mLogTag,

                    "FullScreenMagnificationGestureHandler(detectTripleTap = " + detectTripleTap

services/accessibility/java/com/android/server/accessibility/magnification/MagnificationController.java

+42 −3
Original line number Diff line number Diff line
@@ -34,11 +34,19 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.server.accessibility.AccessibilityManagerService;



/**

 * Handles all magnification controllers initialization, generic interactions

 * and magnification mode transition.

 * Handles all magnification controllers initialization, generic interactions,

 * magnification mode transition and magnification switch UI show/hide logic

 * in the following callbacks:

 *

 * <ol>

 *   <li> 1. {@link #onTouchInteractionStart} shows magnification switch UI when

 *   the user touch interaction starts if magnification capabilities is all. </li>

 *   <li> 2. {@link #onTouchInteractionEnd} shows magnification switch UI when

 *   the user touch interaction ends if magnification capabilities is all. </li>

 * </ol>

 */

public class MagnificationController implements WindowMagnificationManager.Callback,

        MagnificationGestureHandler.ScaleChangedListener {

        MagnificationGestureHandler.Callback {



    private static final boolean DEBUG = false;

    private static final String TAG = "MagnificationController";
@@ -86,6 +94,25 @@ public class MagnificationController implements WindowMagnificationManager.Callb 
        getWindowMagnificationMgr().persistScale(displayId);

    }



    @Override

    public void onTouchInteractionStart(int displayId, int mode) {

        handleUserInteractionChanged(displayId, mode);

    }



    @Override

    public void onTouchInteractionEnd(int displayId, int mode) {

        handleUserInteractionChanged(displayId, mode);

    }



    private void handleUserInteractionChanged(int displayId, int mode) {

        if (mMagnificationCapabilities != Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_ALL) {

            return;

        }

        if (isActivated(displayId, mode)) {

            getWindowMagnificationMgr().showMagnificationButton(displayId, mode);

        }

    }



    /**

     * Transitions to the target Magnification mode with current center of the magnification mode

     * if it is available.
@@ -262,6 +289,18 @@ public class MagnificationController implements WindowMagnificationManager.Callb 
        return mTempPoint;

    }



    private boolean isActivated(int displayId, int mode) {

        boolean isActivated = false;

        if (mode == ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN

                && mFullScreenMagnificationController != null) {

            isActivated = mFullScreenMagnificationController.isMagnifying(displayId);

        } else if (mode == ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW

                && mWindowMagnificationMgr != null) {

            isActivated = mWindowMagnificationMgr.isWindowMagnifierEnabled(displayId);

        }

        return isActivated;

    }



    private final class DisableMagnificationCallback implements

            MagnificationAnimationCallback {

        private final TransitionCallBack mTransitionCallBack;

services/accessibility/java/com/android/server/accessibility/magnification/MagnificationGestureHandler.java

+30 −8
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
package com.android.server.accessibility.magnification;



import static android.view.InputDevice.SOURCE_TOUCHSCREEN;

import static android.view.MotionEvent.ACTION_CANCEL;

import static android.view.MotionEvent.ACTION_UP;



import android.annotation.NonNull;

import android.util.Log;
@@ -59,20 +61,34 @@ public abstract class MagnificationGestureHandler extends BaseEventStreamTransfo 
     */

    protected final boolean mDetectTripleTap;



    /** Interface for listening to the magnification scaling gesture. */

    public interface ScaleChangedListener {

    /** Callback interface to report that magnification is interactive with a user. */

    public interface Callback {

        /**

         * Called when the touch interaction is started by a user.

         *

         * @param displayId The logical display id

         * @param mode The magnification mode

         */

        void onTouchInteractionStart(int displayId, int mode);



        /**

         * Called when the touch interaction is ended by a user.

         *

         * @param displayId The logical display id

         * @param mode The magnification mode

         */

        void onTouchInteractionEnd(int displayId, int mode);

    }



    protected final ScaleChangedListener mListener;

    protected final Callback mCallback;



    protected MagnificationGestureHandler(int displayId, boolean detectTripleTap,

            boolean detectShortcutTrigger,

            @NonNull ScaleChangedListener listener) {

            @NonNull Callback callback) {

        mDisplayId = displayId;

        mDetectTripleTap = detectTripleTap;

        mDetectShortcutTrigger = detectShortcutTrigger;

        mListener = listener;

        mCallback = callback;



        mDebugInputEventHistory = DEBUG_EVENT_STREAM ? new ArrayDeque<>() : null;

        mDebugOutputEventHistory = DEBUG_EVENT_STREAM ? new ArrayDeque<>() : null;
@@ -90,6 +106,13 @@ public abstract class MagnificationGestureHandler extends BaseEventStreamTransfo 
            dispatchTransformedEvent(event, rawEvent, policyFlags);

        } else {

            onMotionEventInternal(event, rawEvent, policyFlags);



            final int action = event.getAction();

            if (action == MotionEvent.ACTION_DOWN) {

                mCallback.onTouchInteractionStart(mDisplayId, getMode());

            } else if (action == ACTION_UP || action == ACTION_CANCEL) {

                mCallback.onTouchInteractionEnd(mDisplayId, getMode());

            }

        }

    }
@@ -101,8 +124,7 @@ public abstract class MagnificationGestureHandler extends BaseEventStreamTransfo 
        return false;

    }



    final void dispatchTransformedEvent(MotionEvent event, MotionEvent rawEvent,

            int policyFlags) {

    final void dispatchTransformedEvent(MotionEvent event, MotionEvent rawEvent, int policyFlags) {

        if (DEBUG_EVENT_STREAM) {

            storeEventInto(mDebugOutputEventHistory, event);

            try {

services/accessibility/java/com/android/server/accessibility/magnification/WindowMagnificationGestureHandler.java

+2 −2
Original line number Diff line number Diff line
@@ -88,9 +88,9 @@ public class WindowMagnificationGestureHandler extends MagnificationGestureHandl 


    public WindowMagnificationGestureHandler(Context context,

            WindowMagnificationManager windowMagnificationMgr,

            ScaleChangedListener listener,

            Callback callback,

            boolean detectTripleTap, boolean detectShortcutTrigger, int displayId) {

        super(displayId, detectTripleTap, detectShortcutTrigger, listener);

        super(displayId, detectTripleTap, detectShortcutTrigger, callback);

        if (DEBUG_ALL) {

            Slog.i(mLogTag,

                    "WindowMagnificationGestureHandler() , displayId = " + displayId + ")");

services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandlerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ public class FullScreenMagnificationGestureHandlerTest { 
    private Context mContext;

    FullScreenMagnificationController mFullScreenMagnificationController;

    @Mock

    MagnificationGestureHandler.ScaleChangedListener mMockScaleChangedListener;

    MagnificationGestureHandler.Callback mMockCallback;

    @Mock

    MagnificationRequestObserver mMagnificationRequestObserver;

    @Mock
@@ -178,7 +178,7 @@ public class FullScreenMagnificationGestureHandlerTest { 
    private FullScreenMagnificationGestureHandler newInstance(boolean detectTripleTap,

            boolean detectShortcutTrigger) {

        FullScreenMagnificationGestureHandler h = new FullScreenMagnificationGestureHandler(

                mContext, mFullScreenMagnificationController, mMockScaleChangedListener,

                mContext, mFullScreenMagnificationController, mMockCallback,

                detectTripleTap, detectShortcutTrigger,

                mWindowMagnificationPromptController, DISPLAY_0);

        mHandler = new TestHandler(h.mDetectingState, mClock) {