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

Commit 36afc2b7 authored by Nick Armstrong-Crews's avatar Nick Armstrong-Crews Committed by Android Git Automerger
Browse files

am 9b8f82a3: Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev 

* commit '9b8f82a3':
  Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."
parents 953c6a4a 9b8f82a3

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -35217,7 +35217,6 @@ package android.view { 
    field public static final int KEYCODE_SLEEP = 223; // 0xdf

    field public static final int KEYCODE_SOFT_LEFT = 1; // 0x1

    field public static final int KEYCODE_SOFT_RIGHT = 2; // 0x2

    field public static final int KEYCODE_SOFT_SLEEP = 276; // 0x114

    field public static final int KEYCODE_SPACE = 62; // 0x3e

    field public static final int KEYCODE_STAR = 17; // 0x11

    field public static final int KEYCODE_STB_INPUT = 180; // 0xb4

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -37520,7 +37520,6 @@ package android.view { 
    field public static final int KEYCODE_SLEEP = 223; // 0xdf

    field public static final int KEYCODE_SOFT_LEFT = 1; // 0x1

    field public static final int KEYCODE_SOFT_RIGHT = 2; // 0x2

    field public static final int KEYCODE_SOFT_SLEEP = 276; // 0x114

    field public static final int KEYCODE_SPACE = 62; // 0x3e

    field public static final int KEYCODE_STAR = 17; // 0x11

    field public static final int KEYCODE_STB_INPUT = 180; // 0xb4

core/java/android/os/PowerManagerInternal.java

+0 −6
Original line number Diff line number Diff line
@@ -107,12 +107,6 @@ public abstract class PowerManagerInternal { 
     */

    public abstract void setUserActivityTimeoutOverrideFromWindowManager(long timeoutMillis);



    /**

     * Used by the window manager to tell the power manager that the user is no longer actively

     * using the device.

     */

    public abstract void setUserInactiveOverrideFromWindowManager();



    /**

     * Used by device administration to set the maximum screen off timeout.

     *

core/java/android/view/KeyEvent.java

+1 −3
Original line number Diff line number Diff line
@@ -784,10 +784,8 @@ public class KeyEvent extends InputEvent implements Parcelable { 
    /** Key code constant: Step backward media key.

     * Steps media backward, one frame at a time. */

    public static final int KEYCODE_MEDIA_STEP_BACKWARD = 275;

    /** Key code constant: put device to sleep unless a wakelock is held. */

    public static final int KEYCODE_SOFT_SLEEP = 276;



    private static final int LAST_KEYCODE = KEYCODE_SOFT_SLEEP;

    private static final int LAST_KEYCODE = KEYCODE_MEDIA_STEP_BACKWARD;



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

    //  isSystem()

core/res/res/values/attrs.xml

+0 −1
Original line number Diff line number Diff line
@@ -1814,7 +1814,6 @@ i 
        <enum name="KEYCODE_MEDIA_SKIP_BACKWARD" value="273" />

        <enum name="KEYCODE_MEDIA_STEP_FORWARD" value="274" />

        <enum name="KEYCODE_MEDIA_STEP_BACKWARD" value="275" />

        <enum name="KEYCODE_SOFT_SLEEP" value="276" />

    </attr>



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