diff options
author | Jeff Brown <jeffbrown@google.com> | 2011-12-06 19:54:24 -0800 |
---|---|---|
committer | Jeff Brown <jeffbrown@google.com> | 2011-12-06 19:54:24 -0800 |
commit | eb3e4b98a45722d5d1ea73e45d86c119d678bb05 (patch) | |
tree | b15f6a7ed9ae94e51c8eb4f605705fbf1d5d4105 /policy/src/com/android/internal | |
parent | 6b8b5a0a4183c0f8d1d5ceacc9e50194589a77d3 (diff) | |
download | frameworks_base-eb3e4b98a45722d5d1ea73e45d86c119d678bb05.zip frameworks_base-eb3e4b98a45722d5d1ea73e45d86c119d678bb05.tar.gz frameworks_base-eb3e4b98a45722d5d1ea73e45d86c119d678bb05.tar.bz2 |
Make the dock orientation override the HDMI orientation.
Bug: 5714422
Change-Id: I5a229f987fb88a25d2e49d0c73184f556ffc1114
Diffstat (limited to 'policy/src/com/android/internal')
-rwxr-xr-x | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 46463ab..22f9880 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -3134,10 +3134,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } final int preferredRotation; - if (mHdmiPlugged) { - // Ignore sensor when plugged into HDMI. - preferredRotation = mHdmiRotation; - } else if (mLidOpen == LID_OPEN && mLidOpenRotation >= 0) { + if (mLidOpen == LID_OPEN && mLidOpenRotation >= 0) { // Ignore sensor when lid switch is open and rotation is forced. preferredRotation = mLidOpenRotation; } else if (mDockMode == Intent.EXTRA_DOCK_STATE_CAR @@ -3156,6 +3153,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { // enable 180 degree rotation while docked. preferredRotation = mDeskDockEnablesAccelerometer ? sensorRotation : mDeskDockRotation; + } else if (mHdmiPlugged) { + // Ignore sensor when plugged into HDMI. + // Note that the dock orientation overrides the HDMI orientation. + preferredRotation = mHdmiRotation; } else if ((mAccelerometerDefault != 0 /* implies not rotation locked */ && (orientation == ActivityInfo.SCREEN_ORIENTATION_USER || orientation == ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED)) |