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

Commit 9eeb55ec authored by Asmita Poddar's avatar Asmita Poddar Committed by Android (Google) Code Review
Browse files

Merge "Add numpad support for mouse keys" into main

parents b976c8e9 474b4bfc
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -1271,6 +1271,7 @@ public class InputSettings {
     * @hide
     */
    @FlaggedApi(FLAG_KEYBOARD_A11Y_MOUSE_KEYS)
    @RequiresPermission(Manifest.permission.WRITE_SETTINGS)
    public static void setPrimaryKeysForMouseKeysEnabled(
            @NonNull Context context, boolean enabled) {
        if (!isAccessibilityMouseKeysFeatureFlagEnabled()) {
+16 −14
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.Context;
import android.graphics.Region;
import android.hardware.input.InputManager;
import android.os.Build;
import android.os.Looper;
import android.os.PowerManager;
@@ -66,7 +65,6 @@ import com.android.server.policy.WindowManagerPolicy;
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Objects;
import java.util.StringJoiner;

/**
@@ -805,6 +803,7 @@ public class AccessibilityInputFilter extends InputFilter implements EventStream
        }

        if ((mEnabledFeatures & FLAG_FEATURE_MOUSE_KEYS) != 0) {
            if (mMouseKeysInterceptor == null) {
                TimeSource systemClockTimeSource = new TimeSource() {
                    @Override
                    public long uptimeMillis() {
@@ -812,12 +811,14 @@ public class AccessibilityInputFilter extends InputFilter implements EventStream
                    }
                };
                mMouseKeysInterceptor = new MouseKeysInterceptor(mAms,
                    Objects.requireNonNull(mContext.getSystemService(InputManager.class)),
                        mContext,
                        Looper.myLooper(),
                        Display.DEFAULT_DISPLAY,
                    systemClockTimeSource);
                        systemClockTimeSource,
                        mUserId);
                addFirstEventHandler(Display.DEFAULT_DISPLAY, mMouseKeysInterceptor);
            }
        }

        if (Flags.enableMagnificationKeyboardControl()
                && isAnyMagnificationEnabled(mEnabledFeatures)) {
@@ -1498,3 +1499,4 @@ public class AccessibilityInputFilter extends InputFilter implements EventStream
        }
    }
}
+284 −48

File changed.

Preview size limit exceeded, changes collapsed.

+158 −24

File changed.

Preview size limit exceeded, changes collapsed.