Configurable 0, 90, 180 and 270 degree rotation (cfc789f1) · Commits · e / os / android_frameworks_base

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

+30 −3

Original line number	Diff line number	Diff line
		@@ -356,6 +356,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {

		int mUserRotationMode = WindowManagerPolicy.USER_ROTATION_FREE;
		int mUserRotation = Surface.ROTATION_0;
		int mUserRotationAngles = -1;
		boolean mAccelerometerDefault;

		int mAllowAllRotations = -1;
		@@ -588,6 +589,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		Settings.Secure.DEFAULT_INPUT_METHOD), false, this);
		resolver.registerContentObserver(Settings.System.getUriFor(
		"fancy_rotation_anim"), false, this);
		resolver.registerContentObserver(Settings.System.getUriFor(
		Settings.System.ACCELEROMETER_ROTATION_ANGLES), false, this);
		resolver.registerContentObserver(Settings.Secure.getUriFor(
		Settings.Secure.SCREENSAVER_ENABLED), false, this);
		if (SEPARATE_TIMEOUT_FOR_SCREEN_SAVER) {
		@@ -1206,6 +1209,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		updateOrientationListenerLp();
		}

		mUserRotationAngles = Settings.System.getInt(resolver,
		Settings.System.ACCELEROMETER_ROTATION_ANGLES, -1);

		if (mSystemReady) {
		int pointerLocation = Settings.System.getInt(resolver,
		Settings.System.POINTER_LOCATION, 0);
		@@ -3907,9 +3913,30 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		mAllowAllRotations = mContext.getResources().getBoolean(
		com.android.internal.R.bool.config_allowAllRotations) ? 1 : 0;
		}
		if (sensorRotation != Surface.ROTATION_180
		\|\| mAllowAllRotations == 1
		\|\| orientation == ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR) {
		// Rotation setting bitmask
		// 1=0 2=90 4=180 8=270
		boolean allowed = true;
		if (mUserRotationAngles < 0) {
		// Not set by user so use these defaults
		mUserRotationAngles = mAllowAllRotations == 1 ?
		(1 \| 2 \| 4 \| 8) : // All angles
		(1 \| 2 \| 8); // All except 180
		}
		switch (sensorRotation) {
		case Surface.ROTATION_0:
		allowed = (mUserRotationAngles & 1) != 0;
		break;
		case Surface.ROTATION_90:
		allowed = (mUserRotationAngles & 2) != 0;
		break;
		case Surface.ROTATION_180:
		allowed = (mUserRotationAngles & 4) != 0;
		break;
		case Surface.ROTATION_270:
		allowed = (mUserRotationAngles & 8) != 0;
		break;
		}
		if (allowed) {
		preferredRotation = sensorRotation;
		} else {
		preferredRotation = lastRotation;