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

Commit 3b028d06 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "input: clean up three-finger tap shortcut flag" into main

parents 7cb8753c 674d4b5e

core/java/android/hardware/input/InputSettings.java

+1 −12
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import static com.android.hardware.input.Flags.mouseSwapPrimaryButton; 
import static com.android.hardware.input.Flags.pointerAcceleration;

import static com.android.hardware.input.Flags.touchpadDisable;

import static com.android.hardware.input.Flags.touchpadSystemGestureDisable;

import static com.android.hardware.input.Flags.touchpadThreeFingerTapShortcut;

import static com.android.hardware.input.Flags.touchpadVisualizer;

import static com.android.input.flags.Flags.FLAG_KEYBOARD_REPEAT_KEYS;

import static com.android.input.flags.Flags.keyboardRepeatKeys;
@@ -453,15 +452,6 @@ public class InputSettings { 
        return touchpadVisualizer();

    }



    /**

     * Returns true if the feature flag for the touchpad three-finger tap shortcut is enabled.

     *

     * @hide

     */

    public static boolean isTouchpadThreeFingerTapShortcutFeatureFlagEnabled() {

        return isCustomizableInputGesturesFeatureFlagEnabled() && touchpadThreeFingerTapShortcut();

    }



    /**

     * Returns true if the feature flag for toggling the mouse scrolling acceleration is enabled.

     *
@@ -608,8 +598,7 @@ public class InputSettings { 
        int customizedShortcut = Settings.System.getIntForUser(context.getContentResolver(),

                Settings.System.TOUCHPAD_THREE_FINGER_TAP_CUSTOMIZATION,

                KeyGestureEvent.KEY_GESTURE_TYPE_UNSPECIFIED, UserHandle.USER_CURRENT);

        return customizedShortcut != KeyGestureEvent.KEY_GESTURE_TYPE_UNSPECIFIED

                && isTouchpadThreeFingerTapShortcutFeatureFlagEnabled();

        return customizedShortcut != KeyGestureEvent.KEY_GESTURE_TYPE_UNSPECIFIED;

    }



    /**

core/java/android/hardware/input/input_framework.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -92,13 +92,6 @@ flag { 
    bug: "357144512"

}



flag {

    name: "touchpad_three_finger_tap_shortcut"

    namespace: "input"

    description: "Turns three-finger touchpad taps into a customizable shortcut."

    bug: "365063048"

}



flag {

    name: "enable_display_color_inversion_key_gestures"

    namespace: "input"