am 44000eb2: am 678c2e35: Merge change I9ef88863 into eclair

Merge commit '44000eb2a2340b1a47eaa587d4829810e04cbcdc' into eclair-mr2-plus-aosp

* commit '44000eb2a2340b1a47eaa587d4829810e04cbcdc':
  Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
This commit is contained in:
Mike Lockwood
2009-12-03 16:33:14 -08:00
committed by Android Git Automerger
2 changed files with 25 additions and 21 deletions

View File

@@ -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