diff options
| author | Nick Armstrong-Crews <strongarm@google.com> | 2015-09-08 04:25:01 +0000 |
|---|---|---|
| committer | Nick Armstrong-Crews <strongarm@google.com> | 2015-09-08 04:25:01 +0000 |
| commit | b331bf951499396111cb47b477ac35e82c805322 (patch) | |
| tree | 013863aebef76afcb8fe67146a1411451d136c77 /core | |
| parent | 677adf1e66ba83b8fb2c849c181303b35bd489bc (diff) | |
| download | frameworks_base-b331bf951499396111cb47b477ac35e82c805322.zip frameworks_base-b331bf951499396111cb47b477ac35e82c805322.tar.gz frameworks_base-b331bf951499396111cb47b477ac35e82c805322.tar.bz2 | |
Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."
This reverts commit 677adf1e66ba83b8fb2c849c181303b35bd489bc.
Hiding new keycode to prevent change to public API before resubmitting.
Change-Id: Ic43273dd0c7ade1d51a36b77f363543f1df466e8
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/os/PowerManagerInternal.java | 6 | ||||
| -rw-r--r-- | core/java/android/view/KeyEvent.java | 4 | ||||
| -rw-r--r-- | core/res/res/values/attrs.xml | 1 |
3 files changed, 1 insertions, 10 deletions
diff --git a/core/java/android/os/PowerManagerInternal.java b/core/java/android/os/PowerManagerInternal.java index 70cff00..e742f98 100644 --- a/core/java/android/os/PowerManagerInternal.java +++ b/core/java/android/os/PowerManagerInternal.java @@ -108,12 +108,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. * * This method must only be called by the device administration policy manager. diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index 2bd319c..52852e7 100644 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -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() diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index cf83422..a024656 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -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> <!-- ***************************************************************** --> |