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

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

Merge "Add new KEYCODE_RECENT_APPS"

parents 29c944cd 24ab1036

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -49564,6 +49564,7 @@ package android.view { 
    field public static final int KEYCODE_PROG_YELLOW = 185; // 0xb9

    field public static final int KEYCODE_Q = 45; // 0x2d

    field public static final int KEYCODE_R = 46; // 0x2e

    field public static final int KEYCODE_RECENT_APPS = 312; // 0x138

    field public static final int KEYCODE_REFRESH = 285; // 0x11d

    field public static final int KEYCODE_RIGHT_BRACKET = 72; // 0x48

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

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -2930,7 +2930,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 = 311; // 0x137

    field public static final int LAST_KEYCODE = 312; // 0x138

  }



  public final class KeyboardShortcutGroup implements android.os.Parcelable {

core/java/android/view/KeyEvent.java

+7 −1
Original line number Diff line number Diff line
@@ -892,13 +892,18 @@ public class KeyEvent extends InputEvent implements Parcelable { 
     * The use of this button does not usually correspond to the function of an eraser.

     */

    public static final int KEYCODE_STYLUS_BUTTON_TAIL = 311;

    /**

     * Key code constant: To open recent apps view (a.k.a. Overview).

     * This key is handled by the framework and is never delivered to applications.

     */

    public static final int KEYCODE_RECENT_APPS = 312;



   /**

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

     * @hide

     */

    @TestApi

    public static final int LAST_KEYCODE = KEYCODE_STYLUS_BUTTON_TAIL;

    public static final int LAST_KEYCODE = KEYCODE_RECENT_APPS;



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

    //  isSystem()
@@ -2021,6 +2026,7 @@ public class KeyEvent extends InputEvent implements Parcelable { 
            case KeyEvent.KEYCODE_MENU:

            case KeyEvent.KEYCODE_SOFT_RIGHT:

            case KeyEvent.KEYCODE_HOME:

            case KeyEvent.KEYCODE_RECENT_APPS:

            case KeyEvent.KEYCODE_BACK:

            case KeyEvent.KEYCODE_CALL:

            case KeyEvent.KEYCODE_ENDCALL:

data/keyboards/Generic.kl

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ key 116 POWER 
key 117   NUMPAD_EQUALS

# key 118 "KEY_KPPLUSMINUS"

key 119   BREAK

# key 120 (undefined)

key 120   RECENT_APPS

key 121   NUMPAD_COMMA

key 122   KANA

key 123   EISU

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

+3 −0
Original line number Diff line number Diff line
@@ -2900,6 +2900,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    }

                }

                break;

            case KeyEvent.KEYCODE_RECENT_APPS:

                // TODO(b/261621522): Handle recents key presses

                return key_consumed;

            case KeyEvent.KEYCODE_APP_SWITCH:

                if (!keyguardOn) {

                    if (down && repeatCount == 0) {