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

Commit 2550b28f authored by Vaibhav Devmurari's avatar Vaibhav Devmurari
Browse files

Cleanup old API flag for keycodes 

Bug: 365920375
Test: none
Flag: EXEMPT cleanup
Change-Id: I2bfa26cd6a5d217db3104865e43e68279a5192ba
parent 09c17882

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -51823,7 +51823,7 @@ package android.view { 
    field public static final int KEYCODE_DVR = 173; // 0xad

    field public static final int KEYCODE_E = 33; // 0x21

    field public static final int KEYCODE_EISU = 212; // 0xd4

    field @FlaggedApi("com.android.hardware.input.emoji_and_screenshot_keycodes_available") public static final int KEYCODE_EMOJI_PICKER = 317; // 0x13d

    field public static final int KEYCODE_EMOJI_PICKER = 317; // 0x13d

    field public static final int KEYCODE_ENDCALL = 6; // 0x6

    field public static final int KEYCODE_ENTER = 66; // 0x42

    field public static final int KEYCODE_ENVELOPE = 65; // 0x41
@@ -51956,7 +51956,7 @@ package android.view { 
    field public static final int KEYCODE_RIGHT_BRACKET = 72; // 0x48

    field public static final int KEYCODE_RO = 217; // 0xd9

    field public static final int KEYCODE_S = 47; // 0x2f

    field @FlaggedApi("com.android.hardware.input.emoji_and_screenshot_keycodes_available") public static final int KEYCODE_SCREENSHOT = 318; // 0x13e

    field public static final int KEYCODE_SCREENSHOT = 318; // 0x13e

    field public static final int KEYCODE_SCROLL_LOCK = 116; // 0x74

    field public static final int KEYCODE_SEARCH = 84; // 0x54

    field public static final int KEYCODE_SEMICOLON = 74; // 0x4a

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

+0 −8
Original line number Diff line number Diff line
@@ -28,14 +28,6 @@ flag { 
    bug: "294546335"

}



flag {

    namespace: "input_native"

    name: "emoji_and_screenshot_keycodes_available"

    is_exported: true

    description: "Add new KeyEvent keycodes for opening Emoji Picker and Taking Screenshots"

    bug: "315307777"

}



flag {

    namespace: "input_native"

    name: "keyboard_a11y_slow_keys_flag"

core/java/android/view/KeyEvent.java

+0 −5
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android.view; 
import static android.os.IInputConstants.INPUT_EVENT_FLAG_IS_ACCESSIBILITY_EVENT;

import static android.view.Display.INVALID_DISPLAY;



import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -34,8 +33,6 @@ import android.util.Log; 
import android.util.SparseIntArray;

import android.view.KeyCharacterMap.KeyData;



import com.android.hardware.input.Flags;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.concurrent.TimeUnit;
@@ -935,7 +932,6 @@ public class KeyEvent extends InputEvent implements Parcelable { 
     */

    public static final int KEYCODE_MACRO_4 = 316;

    /** Key code constant: To open emoji picker */

    @FlaggedApi(Flags.FLAG_EMOJI_AND_SCREENSHOT_KEYCODES_AVAILABLE)

    public static final int KEYCODE_EMOJI_PICKER = 317;

    /**

     * Key code constant: To take a screenshot
@@ -944,7 +940,6 @@ public class KeyEvent extends InputEvent implements Parcelable { 
     * unlike {@code KEYCODE_SYSRQ} which is sent to the app first and only if the app

     * doesn't handle it, the framework handles it (to take a screenshot).

     */

    @FlaggedApi(Flags.FLAG_EMOJI_AND_SCREENSHOT_KEYCODES_AVAILABLE)

    public static final int KEYCODE_SCREENSHOT = 318;



    /**

services/core/java/com/android/server/policy/PhoneWindowManager.java

+1 −8
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ import static android.view.WindowManagerGlobal.ADD_OKAY; 
import static android.view.WindowManagerGlobal.ADD_PERMISSION_DENIED;

import static android.view.contentprotection.flags.Flags.createAccessibilityOverlayAppOpEnabled;



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

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

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

import static com.android.hardware.input.Flags.modifierShortcutDump;
@@ -3993,7 +3992,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    return true;

                }

            case KeyEvent.KEYCODE_SCREENSHOT:

                if (emojiAndScreenshotKeycodesAvailable() && down && repeatCount == 0) {

                if (firstDown) {

                    interceptScreenshotChord(SCREENSHOT_KEY_OTHER, 0 /*pressDelay*/);

                }

                return true;
@@ -5666,12 +5665,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            case KeyEvent.KEYCODE_MACRO_4:

                result &= ~ACTION_PASS_TO_USER;

                break;

            case KeyEvent.KEYCODE_EMOJI_PICKER:

                if (!emojiAndScreenshotKeycodesAvailable()) {

                    // Don't allow EMOJI_PICKER key to be dispatched until flag is released.

                    result &= ~ACTION_PASS_TO_USER;

                }

                break;

        }



        if (useHapticFeedback) {

services/tests/wmtests/src/com/android/server/policy/ModifierShortcutTests.java

+0 −12
Original line number Diff line number Diff line
@@ -288,24 +288,12 @@ public class ModifierShortcutTests extends ShortcutKeyTestBase { 
     * Sends a KEYCODE_SCREENSHOT and validates screenshot is taken if flag is enabled

     */

    @Test

    @EnableFlags(com.android.hardware.input.Flags.FLAG_EMOJI_AND_SCREENSHOT_KEYCODES_AVAILABLE)

    @DisableFlags(com.android.hardware.input.Flags.FLAG_USE_KEY_GESTURE_EVENT_HANDLER)

    public void testTakeScreenshot_flagEnabled() {

        sendKeyCombination(new int[]{KEYCODE_SCREENSHOT}, 0);

        mPhoneWindowManager.assertTakeScreenshotCalled();

    }



    /**

     * Sends a KEYCODE_SCREENSHOT and validates screenshot is not taken if flag is disabled

     */

    @Test

    @DisableFlags({com.android.hardware.input.Flags.FLAG_EMOJI_AND_SCREENSHOT_KEYCODES_AVAILABLE,

            com.android.hardware.input.Flags.FLAG_USE_KEY_GESTURE_EVENT_HANDLER})

    public void testTakeScreenshot_flagDisabled() {

        sendKeyCombination(new int[]{KEYCODE_SCREENSHOT}, 0);

        mPhoneWindowManager.assertTakeScreenshotNotCalled();

    }



    /**

     * META+CTRL+BACKSPACE for taking a bugreport when the flag is enabled.

     */