diff options
author | Jeff Brown <jeffbrown@google.com> | 2011-12-07 15:04:39 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-07 15:04:39 -0800 |
commit | ff3b5a828ea1f7409af4475898689804bed10ede (patch) | |
tree | 60373241ec6ddbc211632bda6f429ec52813a04c /policy | |
parent | 87e06ec2fa57a54b92fe82f2cacfbf8a44e47baf (diff) | |
parent | eb3e4b98a45722d5d1ea73e45d86c119d678bb05 (diff) | |
download | frameworks_base-ff3b5a828ea1f7409af4475898689804bed10ede.zip frameworks_base-ff3b5a828ea1f7409af4475898689804bed10ede.tar.gz frameworks_base-ff3b5a828ea1f7409af4475898689804bed10ede.tar.bz2 |
Merge "Make the dock orientation override the HDMI orientation." into ics-mr1
Diffstat (limited to 'policy')
-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)) |