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

Commit bfdad8ec authored by Jaekyun Seok's avatar Jaekyun Seok
Browse files

Add a keycode to switch audio tracks (1/2) 

A key to switch audio tracks is general on media devices like blu-ray.

Bug: 9728155
Change-Id: Ib61822b8aa9c143a8febc3cff4707fa775119448
parent 51a84568

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -25870,6 +25870,7 @@ package android.view { 
    field public static final int KEYCODE_LEFT_BRACKET = 71; // 0x47

    field public static final int KEYCODE_M = 41; // 0x29

    field public static final int KEYCODE_MANNER_MODE = 205; // 0xcd

    field public static final int KEYCODE_MEDIA_AUDIO_TRACK = 222; // 0xde

    field public static final int KEYCODE_MEDIA_CLOSE = 128; // 0x80

    field public static final int KEYCODE_MEDIA_EJECT = 129; // 0x81

    field public static final int KEYCODE_MEDIA_FAST_FORWARD = 90; // 0x5a

core/java/android/view/KeyEvent.java

+5 −1
Original line number Diff line number Diff line
@@ -629,8 +629,11 @@ public class KeyEvent extends InputEvent implements Parcelable { 
    /** Key code constant: Brightness Up key.

     * Adjusts the screen brightness up. */

    public static final int KEYCODE_BRIGHTNESS_UP   = 221;

    /** Key code constant: Audio Track key

     * Switches the audio tracks. */

    public static final int KEYCODE_MEDIA_AUDIO_TRACK = 222;



    private static final int LAST_KEYCODE           = KEYCODE_BRIGHTNESS_UP;

    private static final int LAST_KEYCODE           = KEYCODE_MEDIA_AUDIO_TRACK;



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

    //  isSystem()
@@ -874,6 +877,7 @@ public class KeyEvent extends InputEvent implements Parcelable { 
        names.append(KEYCODE_ASSIST, "KEYCODE_ASSIST");

        names.append(KEYCODE_BRIGHTNESS_DOWN, "KEYCODE_BRIGHTNESS_DOWN");

        names.append(KEYCODE_BRIGHTNESS_UP, "KEYCODE_BRIGHTNESS_UP");

        names.append(KEYCODE_MEDIA_AUDIO_TRACK, "KEYCODE_MEDIA_AUDIO_TRACK");

    };



    // Symbolic names of all metakeys in bit order from least significant to most significant.

core/res/res/values/attrs.xml

+1 −0
Original line number Diff line number Diff line
@@ -1550,6 +1550,7 @@ 
        <enum name="KEYCODE_ASSIST" value="219" />

        <enum name="KEYCODE_BRIGHTNESS_DOWN" value="220" />

        <enum name="KEYCODE_BRIGHTNESS_UP" value="221" />

        <enum name="KEYCODE_MEDIA_AUDIO_TRACK" value="222" />

    </attr>



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

media/java/android/media/AudioService.java

+1 −0
Original line number Diff line number Diff line
@@ -4725,6 +4725,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished { 
            case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD:

            case KeyEvent.KEYCODE_MEDIA_CLOSE:

            case KeyEvent.KEYCODE_MEDIA_EJECT:

            case KeyEvent.KEYCODE_MEDIA_AUDIO_TRACK:

                break;

            default:

                return false;

packages/Keyguard/src/com/android/keyguard/KeyguardViewBase.java

+4 −2
Original line number Diff line number Diff line
@@ -163,7 +163,8 @@ public abstract class KeyguardViewBase extends FrameLayout { 
                case KeyEvent.KEYCODE_MEDIA_PREVIOUS:

                case KeyEvent.KEYCODE_MEDIA_REWIND:

                case KeyEvent.KEYCODE_MEDIA_RECORD:

                case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: {

                case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD:

                case KeyEvent.KEYCODE_MEDIA_AUDIO_TRACK: {

                    handleMediaKeyEvent(event);

                    return true;

                }
@@ -204,7 +205,8 @@ public abstract class KeyguardViewBase extends FrameLayout { 
                case KeyEvent.KEYCODE_MEDIA_PREVIOUS:

                case KeyEvent.KEYCODE_MEDIA_REWIND:

                case KeyEvent.KEYCODE_MEDIA_RECORD:

                case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: {

                case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD:

                case KeyEvent.KEYCODE_MEDIA_AUDIO_TRACK: {

                    handleMediaKeyEvent(event);

                    return true;

                }