Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make the dock orientation override the HDMI orientation." into ics-mr1

Browse Source
This commit is contained in:
Jeff Brown
2011-12-07 15:04:39 -08:00
committed by Android (Google) Code Review
parent 87e06ec2fa eb3e4b98a4
commit ff3b5a828e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -3134,10 +3134,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
} }
final int preferredRotation; final int preferredRotation;
if (mHdmiPlugged) { if (mLidOpen == LID_OPEN && mLidOpenRotation >= 0) {
// Ignore sensor when plugged into HDMI.
preferredRotation = mHdmiRotation;
} else if (mLidOpen == LID_OPEN && mLidOpenRotation >= 0) {
// Ignore sensor when lid switch is open and rotation is forced. // Ignore sensor when lid switch is open and rotation is forced.
preferredRotation = mLidOpenRotation; preferredRotation = mLidOpenRotation;
} else if (mDockMode == Intent.EXTRA_DOCK_STATE_CAR } else if (mDockMode == Intent.EXTRA_DOCK_STATE_CAR
@@ -3156,6 +3153,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// enable 180 degree rotation while docked. // enable 180 degree rotation while docked.
preferredRotation = mDeskDockEnablesAccelerometer preferredRotation = mDeskDockEnablesAccelerometer
? sensorRotation : mDeskDockRotation; ? 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 */ } else if ((mAccelerometerDefault != 0 /* implies not rotation locked */
&& (orientation == ActivityInfo.SCREEN_ORIENTATION_USER && (orientation == ActivityInfo.SCREEN_ORIENTATION_USER
|| orientation == ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED)) || orientation == ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED))