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

Commit 9339c598 authored by Ameer Armaly's avatar Ameer Armaly
Browse files

Move accessibility gesture code into its own package. 

Given the number of classes that are going  to be created (gesture detectors, TouchExplorer state handlers) it made sense to put them into their own package.
Bug: 136131815
Test: atest CtsAccessibilityServiceTestCases CtsAccessibilityTestCases

Change-Id: Ie347424ecd7518a7c5a4fdefdca5b4886b1fd8e4
parent e9598718

services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.view.KeyEvent; 
import android.view.MotionEvent;

import android.view.accessibility.AccessibilityEvent;



import com.android.server.accessibility.gestures.TouchExplorer;

import com.android.server.LocalServices;

import com.android.server.policy.WindowManagerPolicy;

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+4 −4
Original line number Diff line number Diff line
@@ -816,7 +816,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
    }





    boolean onGesture(AccessibilityGestureInfo gestureInfo) {

    public boolean onGesture(AccessibilityGestureInfo gestureInfo) {

        synchronized (mLock) {

            boolean handled = notifyGestureLocked(gestureInfo, false);

            if (!handled) {
@@ -905,15 +905,15 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
        return getInteractionBridge().performActionOnAccessibilityFocusedItemNotLocked(action);

    }



    int getActiveWindowId() {

    public int getActiveWindowId() {

        return mA11yWindowManager.getActiveWindowId(mCurrentUserId);

    }



    void onTouchInteractionStart() {

    public void onTouchInteractionStart() {

        mA11yWindowManager.onTouchInteractionStart();

    }



    void onTouchInteractionEnd() {

    public void onTouchInteractionEnd() {

        mA11yWindowManager.onTouchInteractionEnd();

    }

services/accessibility/java/com/android/server/accessibility/BaseEventStreamTransformation.java

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


package com.android.server.accessibility;



abstract class BaseEventStreamTransformation implements EventStreamTransformation {

public abstract class BaseEventStreamTransformation implements EventStreamTransformation {

    private EventStreamTransformation mNext;



    @Override

services/accessibility/java/com/android/server/accessibility/EventStreamTransformation.java

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ import android.view.accessibility.AccessibilityEvent; 
 * For example, if it received a down motion event followed by a cancel motion

 * event, it should not handle subsequent move and up events until it gets a down.

 */

interface EventStreamTransformation {

public interface EventStreamTransformation {



    /**

     * Receives a motion event. Passed are the event transformed by previous

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

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import static android.view.MotionEvent.ACTION_POINTER_DOWN; 
import static android.view.MotionEvent.ACTION_POINTER_UP;

import static android.view.MotionEvent.ACTION_UP;



import static com.android.server.accessibility.GestureUtils.distance;

import static com.android.server.accessibility.gestures.GestureUtils.distance;



import static java.lang.Math.abs;

import static java.util.Arrays.asList;
@@ -54,6 +54,7 @@ import android.view.ScaleGestureDetector.OnScaleGestureListener; 
import android.view.ViewConfiguration;



import com.android.internal.annotations.VisibleForTesting;

import com.android.server.accessibility.gestures.GestureUtils;



import java.util.ArrayDeque;

import java.util.Queue;