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

Commit 3884f99a authored by Vaibhav Devmurari's avatar Vaibhav Devmurari Committed by Android (Google) Code Review
Browse files

Merge "Add new keycodes to support keyboard backlight up/down/toggle"

parents 0adb9dce bb12898a

core/api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -48662,6 +48662,9 @@ package android.view { 
    field public static final int KEYCODE_K = 39; // 0x27

    field public static final int KEYCODE_KANA = 218; // 0xda

    field public static final int KEYCODE_KATAKANA_HIRAGANA = 215; // 0xd7

    field public static final int KEYCODE_KEYBOARD_BACKLIGHT_DOWN = 305; // 0x131

    field public static final int KEYCODE_KEYBOARD_BACKLIGHT_TOGGLE = 307; // 0x133

    field public static final int KEYCODE_KEYBOARD_BACKLIGHT_UP = 306; // 0x132

    field public static final int KEYCODE_L = 40; // 0x28

    field public static final int KEYCODE_LANGUAGE_SWITCH = 204; // 0xcc

    field public static final int KEYCODE_LAST_CHANNEL = 229; // 0xe5

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -2849,7 +2849,7 @@ package android.view { 
    method public static String actionToString(int);

    method public final void setDisplayId(int);

    field public static final int FLAG_IS_ACCESSIBILITY_EVENT = 2048; // 0x800

    field public static final int LAST_KEYCODE = 304; // 0x130

    field public static final int LAST_KEYCODE = 307; // 0x133

  }



  public final class KeyboardShortcutGroup implements android.os.Parcelable {

core/java/android/view/KeyEvent.java

+10 −1
Original line number Diff line number Diff line
@@ -866,13 +866,19 @@ public class KeyEvent extends InputEvent implements Parcelable { 
    public static final int KEYCODE_DEMO_APP_3 = 303;

    /** Key code constant: Demo Application key #4. */

    public static final int KEYCODE_DEMO_APP_4 = 304;

    /** Key code constant: Keyboard backlight down */

    public static final int KEYCODE_KEYBOARD_BACKLIGHT_DOWN = 305;

    /** Key code constant: Keyboard backlight up */

    public static final int KEYCODE_KEYBOARD_BACKLIGHT_UP = 306;

    /** Key code constant: Keyboard backlight toggle */

    public static final int KEYCODE_KEYBOARD_BACKLIGHT_TOGGLE = 307;



   /**

     * Integer value of the last KEYCODE. Increases as new keycodes are added to KeyEvent.

     * @hide

     */

    @TestApi

    public static final int LAST_KEYCODE = KEYCODE_DEMO_APP_4;

    public static final int LAST_KEYCODE = KEYCODE_KEYBOARD_BACKLIGHT_TOGGLE;



    // NOTE: If you add a new keycode here you must also add it to:

    //  isSystem()
@@ -2019,6 +2025,9 @@ public class KeyEvent extends InputEvent implements Parcelable { 
            case KeyEvent.KEYCODE_SEARCH:

            case KeyEvent.KEYCODE_BRIGHTNESS_DOWN:

            case KeyEvent.KEYCODE_BRIGHTNESS_UP:

            case KeyEvent.KEYCODE_KEYBOARD_BACKLIGHT_DOWN:

            case KeyEvent.KEYCODE_KEYBOARD_BACKLIGHT_UP:

            case KeyEvent.KEYCODE_KEYBOARD_BACKLIGHT_TOGGLE:

            case KeyEvent.KEYCODE_MEDIA_AUDIO_TRACK:

            case KeyEvent.KEYCODE_SYSTEM_NAVIGATION_UP:

            case KeyEvent.KEYCODE_SYSTEM_NAVIGATION_DOWN:

data/keyboards/Generic.kl

+6 −0
Original line number Diff line number Diff line
@@ -246,6 +246,9 @@ key 217 SEARCH 
key 224   BRIGHTNESS_DOWN

key 225   BRIGHTNESS_UP

key 226   HEADSETHOOK

key 228   KEYBOARD_BACKLIGHT_TOGGLE

key 229   KEYBOARD_BACKLIGHT_DOWN

key 230   KEYBOARD_BACKLIGHT_UP



key 256   BUTTON_1

key 257   BUTTON_2
@@ -415,6 +418,9 @@ key 583 ASSIST 
key usage 0x0c0067 WINDOW

key usage 0x0c006F BRIGHTNESS_UP

key usage 0x0c0070 BRIGHTNESS_DOWN

key usage 0x0c0079 KEYBOARD_BACKLIGHT_UP

key usage 0x0c007A KEYBOARD_BACKLIGHT_DOWN

key usage 0x0c007C KEYBOARD_BACKLIGHT_TOGGLE

key usage 0x0c0173 MEDIA_AUDIO_TRACK

key usage 0x0c019C PROFILE_SWITCH

key usage 0x0c01A2 ALL_APPS

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

+5 −0
Original line number Diff line number Diff line
@@ -2930,6 +2930,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                            UserHandle.CURRENT_OR_SELF);

                }

                return key_consumed;

            case KeyEvent.KEYCODE_KEYBOARD_BACKLIGHT_DOWN:

            case KeyEvent.KEYCODE_KEYBOARD_BACKLIGHT_UP:

            case KeyEvent.KEYCODE_KEYBOARD_BACKLIGHT_TOGGLE:

                // TODO: Add logic to handle keyboard backlight controls (go/pk_backlight_control)

                return key_consumed;

            case KeyEvent.KEYCODE_VOLUME_UP:

            case KeyEvent.KEYCODE_VOLUME_DOWN:

            case KeyEvent.KEYCODE_VOLUME_MUTE: