diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-11-09 14:36:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-09 14:36:34 +0000 |
| commit | 0816b0c871ea93ffbcd3c60151d067dcfcebc1ac (patch) | |
| tree | 277491a46d9179c36301f124546ca789b31b790d /policy | |
| parent | 6437035400ae63a6f3eb2e375cb979bdd0037ba0 (diff) | |
| parent | bc0b010ecc7254b0e2c7a0268e5242557579b471 (diff) | |
| download | frameworks_base-0816b0c871ea93ffbcd3c60151d067dcfcebc1ac.zip frameworks_base-0816b0c871ea93ffbcd3c60151d067dcfcebc1ac.tar.gz frameworks_base-0816b0c871ea93ffbcd3c60151d067dcfcebc1ac.tar.bz2 | |
am bc0b010e: Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1
* commit 'bc0b010ecc7254b0e2c7a0268e5242557579b471':
Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662
Diffstat (limited to 'policy')
| -rwxr-xr-x | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 7d97246..aa1c81c 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -493,7 +493,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { return true; } if ((mCarDockEnablesAccelerometer && mDockMode == Intent.EXTRA_DOCK_STATE_CAR) || - (mDeskDockEnablesAccelerometer && mDockMode == Intent.EXTRA_DOCK_STATE_DESK)) { + (mDeskDockEnablesAccelerometer && (mDockMode == Intent.EXTRA_DOCK_STATE_DESK + || mDockMode == Intent.EXTRA_DOCK_STATE_LE_DESK + || mDockMode == Intent.EXTRA_DOCK_STATE_HE_DESK))) { // enable accelerometer if we are docked in a dock that enables accelerometer // orientation management, return true; @@ -3137,7 +3139,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { // enable 180 degree rotation while docked. preferredRotation = mCarDockEnablesAccelerometer ? sensorRotation : mCarDockRotation; - } else if (mDockMode == Intent.EXTRA_DOCK_STATE_DESK + } else if ((mDockMode == Intent.EXTRA_DOCK_STATE_DESK + || mDockMode == Intent.EXTRA_DOCK_STATE_LE_DESK + || mDockMode == Intent.EXTRA_DOCK_STATE_HE_DESK) && (mDeskDockEnablesAccelerometer || mDeskDockRotation >= 0)) { // Ignore sensor when in desk dock unless explicitly enabled. // This case can override the behavior of NOSENSOR, and can also |