summaryrefslogtreecommitdiffstats
path: root/core/java/android/view/WindowManagerPolicy.java
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2009-12-03 11:18:48 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-03 11:18:48 -0800
commit44000eb2a2340b1a47eaa587d4829810e04cbcdc (patch)
tree5dfe03faff6ecb08b266d93ddb696c94fca86da1 /core/java/android/view/WindowManagerPolicy.java
parent1b794bbbdc961558a9f0ee956d9d3f684d1f0497 (diff)
parent678c2e35768a5426b4ad8f67c836008e7751a353 (diff)
downloadframeworks_base-44000eb2a2340b1a47eaa587d4829810e04cbcdc.zip
frameworks_base-44000eb2a2340b1a47eaa587d4829810e04cbcdc.tar.gz
frameworks_base-44000eb2a2340b1a47eaa587d4829810e04cbcdc.tar.bz2
am 678c2e35: Merge change I9ef88863 into eclair
Merge commit '678c2e35768a5426b4ad8f67c836008e7751a353' into eclair-mr2 * commit '678c2e35768a5426b4ad8f67c836008e7751a353': Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Diffstat (limited to 'core/java/android/view/WindowManagerPolicy.java')
-rw-r--r--core/java/android/view/WindowManagerPolicy.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java
index b8bd6a0..5d3840a 100644
--- a/core/java/android/view/WindowManagerPolicy.java
+++ b/core/java/android/view/WindowManagerPolicy.java
@@ -361,6 +361,8 @@ public interface WindowManagerPolicy {
public final int OFF_BECAUSE_OF_USER = 1;
/** Screen turned off because of timeout */
public final int OFF_BECAUSE_OF_TIMEOUT = 2;
+ /** Screen turned off because of proximity sensor */
+ public final int OFF_BECAUSE_OF_PROX_SENSOR = 3;
/**
* Magic constant to {@link IWindowManager#setRotation} to not actually