diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-05-21 04:28:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-21 04:28:34 +0000 |
| commit | 6fb904bfd1f943547d6e5bc6f199ffec2290da01 (patch) | |
| tree | 953468479df915cd9492da0f798f7e330a26d88d /core | |
| parent | ef6aae62f6c92bc9413db60c28cc4b3230f4d2fa (diff) | |
| parent | 6d8fd27e51d799cf7418b14092b5e806d9792812 (diff) | |
| download | frameworks_base-6fb904bfd1f943547d6e5bc6f199ffec2290da01.zip frameworks_base-6fb904bfd1f943547d6e5bc6f199ffec2290da01.tar.gz frameworks_base-6fb904bfd1f943547d6e5bc6f199ffec2290da01.tar.bz2 | |
Merge "Make power button behavior configurable." into klp-modular-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/os/IPowerManager.aidl | 2 | ||||
| -rw-r--r-- | core/java/android/os/PowerManager.java | 15 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 8 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
4 files changed, 24 insertions, 2 deletions
diff --git a/core/java/android/os/IPowerManager.aidl b/core/java/android/os/IPowerManager.aidl index 92af1a5..e7330bb 100644 --- a/core/java/android/os/IPowerManager.aidl +++ b/core/java/android/os/IPowerManager.aidl @@ -35,7 +35,7 @@ interface IPowerManager void userActivity(long time, int event, int flags); void wakeUp(long time); - void goToSleep(long time, int reason); + void goToSleep(long time, int reason, int flags); void nap(long time); boolean isInteractive(); diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index 646bfef..96cfa29 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -302,6 +302,12 @@ public final class PowerManager { */ public static final int GO_TO_SLEEP_REASON_TIMEOUT = 2; + /** + * Go to sleep flag: Skip dozing state and directly go to full sleep. + * @hide + */ + public static final int GO_TO_SLEEP_FLAG_NO_DOZE = 1 << 0; + final Context mContext; final IPowerManager mService; final Handler mHandler; @@ -490,8 +496,15 @@ public final class PowerManager { * @see #wakeUp */ public void goToSleep(long time) { + goToSleep(time, GO_TO_SLEEP_REASON_USER, 0); + } + + /** + * @hide + */ + public void goToSleep(long time, int reason, int flags) { try { - mService.goToSleep(time, GO_TO_SLEEP_REASON_USER); + mService.goToSleep(time, reason, flags); } catch (RemoteException e) { } } diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index dd13db0..99be34a 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -485,6 +485,14 @@ --> <integer name="config_longPressOnPowerBehavior">1</integer> + <!-- Control the behavior when the user short presses the power button. + 0 - Nothing + 1 - Go to sleep (doze) + 2 - Really go to sleep (don't doze) + 3 - Really go to sleep and go home (don't doze) + --> + <integer name="config_shortPressOnPowerBehavior">1</integer> + <!-- Package name for default keyguard appwidget [DO NOT TRANSLATE] --> <string name="widget_default_package_name"></string> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 29ac8de..5b2b394 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -304,6 +304,7 @@ <java-symbol type="integer" name="config_ntpRetry" /> <java-symbol type="integer" name="config_ntpThreshold" /> <java-symbol type="integer" name="config_ntpTimeout" /> + <java-symbol type="integer" name="config_shortPressOnPowerBehavior" /> <java-symbol type="integer" name="config_toastDefaultGravity" /> <java-symbol type="integer" name="config_wifi_framework_scan_interval" /> <java-symbol type="integer" name="config_wifi_supplicant_scan_interval" /> |