summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorJoe Onorato <>2009-03-24 19:11:13 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-24 19:11:13 -0700
commite68ffcb5764152da6d36adc8f2918200b4472c23 (patch)
treefe7ff65173581d017893e1bc59a53a39787ddf03 /core/java
parent6c884ceb0bdee0c338949432b4de56523fa9d895 (diff)
downloadframeworks_base-e68ffcb5764152da6d36adc8f2918200b4472c23.zip
frameworks_base-e68ffcb5764152da6d36adc8f2918200b4472c23.tar.gz
frameworks_base-e68ffcb5764152da6d36adc8f2918200b4472c23.tar.bz2
Automated import from //branches/donutburger/...@140997,140997
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/os/LocalPowerManager.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/os/LocalPowerManager.java b/core/java/android/os/LocalPowerManager.java
index 55d7972..9e88f5a 100644
--- a/core/java/android/os/LocalPowerManager.java
+++ b/core/java/android/os/LocalPowerManager.java
@@ -20,12 +20,16 @@ package android.os;
public interface LocalPowerManager {
public static final int OTHER_EVENT = 0;
public static final int CHEEK_EVENT = 1;
- public static final int TOUCH_EVENT = 2;
- public static final int BUTTON_EVENT = 3; // Button and trackball events.
+ public static final int TOUCH_EVENT = 2; // touch events are TOUCH for 300ms, and then either
+ // up events or LONG_TOUCH events.
+ public static final int LONG_TOUCH_EVENT = 3;
+ public static final int TOUCH_UP_EVENT = 4;
+ public static final int BUTTON_EVENT = 5; // Button and trackball events.
public static final int POKE_LOCK_IGNORE_CHEEK_EVENTS = 0x1;
public static final int POKE_LOCK_SHORT_TIMEOUT = 0x2;
public static final int POKE_LOCK_MEDIUM_TIMEOUT = 0x4;
+ public static final int POKE_LOCK_IGNORE_TOUCH_AND_CHEEK_EVENTS = 0x8;
public static final int POKE_LOCK_TIMEOUT_MASK = 0x6;