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

Commit 892debc6 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 65369424: merge from open-source master 

Merge commit '65369424' into kraken

* commit '65369424':
  Add keycodes PageUp and PageDown
parents bc494d43 65369424

api/current.xml

+22 −0
Original line number Diff line number Diff line
@@ -169651,6 +169651,28 @@ 
 visibility="public"

>

</field>

<field name="KEYCODE_PAGE_DOWN"

 type="int"

 transient="false"

 volatile="false"

 value="93"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_PAGE_UP"

 type="int"

 transient="false"

 volatile="false"

 value="92"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="KEYCODE_PERIOD"

 type="int"

 transient="false"

core/java/android/view/KeyEvent.java

+3 −1
Original line number Diff line number Diff line
@@ -120,6 +120,8 @@ public class KeyEvent implements Parcelable { 
    public static final int KEYCODE_MEDIA_REWIND    = 89;

    public static final int KEYCODE_MEDIA_FAST_FORWARD = 90;

    public static final int KEYCODE_MUTE            = 91;

    public static final int KEYCODE_PAGE_UP         = 92;

    public static final int KEYCODE_PAGE_DOWN       = 93;



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

    //  isSystem()
@@ -135,7 +137,7 @@ public class KeyEvent implements Parcelable { 
    //  those new codes.  This is intended to maintain a consistent

    //  set of key code definitions across all Android devices.

   

    private static final int LAST_KEYCODE           = KEYCODE_MUTE;

    private static final int LAST_KEYCODE           = KEYCODE_PAGE_DOWN;

    

    /**

     * @deprecated There are now more than MAX_KEYCODE keycodes.

core/res/res/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -916,6 +916,8 @@ 
        <enum name="KEYCODE_MEDIA_REWIND" value="89" />

        <enum name="KEYCODE_MEDIA_FAST_FORWARD" value="90" />

        <enum name="KEYCODE_MUTE" value="91" />

        <enum name="KEYCODE_PAGE_UP" value="92" />

        <enum name="KEYCODE_PAGE_DOWN" value="93" />

    </attr>



    <!-- ***************************************************************** -->

include/ui/KeycodeLabels.h

+5 −1
Original line number Diff line number Diff line
@@ -114,6 +114,8 @@ static const KeycodeLabel KEYCODES[] = { 
    { "MEDIA_REWIND", 89 },

    { "MEDIA_FAST_FORWARD", 90 },

    { "MUTE", 91 },

    { "PAGE_UP", 92 },

    { "PAGE_DOWN", 93 },



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

    //   (enum KeyCode, in this file)
@@ -218,7 +220,9 @@ typedef enum KeyCode { 
    kKeyCodePreviousSong = 88,

    kKeyCodeRewind = 89,

    kKeyCodeForward = 90,

    kKeyCodeMute = 91

    kKeyCodeMute = 91,

    kKeyCodePageUp = 92,

    kKeyCodePageDown = 93

} KeyCode;



static const KeycodeLabel FLAGS[] = {