Merge "allow override of HDMI rotation" (893746be) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -276,6 +276,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		int mLidOpenRotation;
		int mCarDockRotation;
		int mDeskDockRotation;
		int mHdmiRotation;

		int mUserRotationMode = WindowManagerPolicy.USER_ROTATION_FREE;
		int mUserRotation = Surface.ROTATION_0;
		@@ -777,6 +778,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		? mContext.getResources().getDimensionPixelSize(
		com.android.internal.R.dimen.navigation_bar_width)
		: 0;

		if ("portrait".equals(SystemProperties.get("persist.demo.hdmirotation"))) {
		mHdmiRotation = mPortraitRotation;
		} else {
		mHdmiRotation = mLandscapeRotation;
		}
		}

		public void updateSettings() {
		@@ -2922,7 +2929,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		int preferredRotation = -1;
		if (mHdmiPlugged) {
		// Ignore sensor when plugged into HDMI.
		preferredRotation = mLandscapeRotation;
		preferredRotation = mHdmiRotation;
		} else if (mLidOpen == LID_OPEN && mLidOpenRotation >= 0) {
		// Ignore sensor when lid switch is open and rotation is forced.
		preferredRotation = mLidOpenRotation;