Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 96fe0a91 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Michael Bestas
Browse files

Configurable 0, 90, 180 and 270 degree rotation 

Change-Id: Ia1859c51d71ef9d01cec2d13c6468ed89c6ac53e
Contributor: jonasl

- Add system setting

Change-Id: Ia7bf8cb64258e1d602230a8f9ea227d3b56a4dab
parent d521eba7

core/java/android/provider/Settings.java

+13 −0
Original line number Diff line number Diff line
@@ -3243,6 +3243,19 @@ public final class Settings { 
        @Deprecated

        public static final String ANIMATOR_DURATION_SCALE = Global.ANIMATOR_DURATION_SCALE;



        /**

         * Control the type of rotation which can be performed using the accelerometer

         * if ACCELEROMETER_ROTATION is enabled.

         * Value is a bitwise combination of

         * 1 = 0 degrees (portrait)

         * 2 = 90 degrees (left)

         * 4 = 180 degrees (inverted portrait)

         * 8 = 270 degrees (right)

         * Setting to 0 is effectively orientation lock

         * @hide

         */

        public static final String ACCELEROMETER_ROTATION_ANGLES = "accelerometer_rotation_angles";



        /**

         * Control whether the accelerometer will be used to change screen

         * orientation.  If 0, it will not be used unless explicitly requested

services/core/java/com/android/server/policy/PhoneWindowManager.java

+32 −4
Original line number Diff line number Diff line
@@ -505,6 +505,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 


    int mUserRotationMode = WindowManagerPolicy.USER_ROTATION_FREE;

    int mUserRotation = Surface.ROTATION_0;

    int mUserRotationAngles = -1;

    boolean mAccelerometerDefault;



    boolean mSupportAutoRotation;
@@ -1019,6 +1020,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            resolver.registerContentObserver(CMSettings.System.getUriFor(

                    CMSettings.System.VOLUME_WAKE_SCREEN), false, this,

                    UserHandle.USER_ALL);

            resolver.registerContentObserver(Settings.System.getUriFor(

                    Settings.System.ACCELEROMETER_ROTATION_ANGLES), false, this,

                    UserHandle.USER_ALL);



            updateSettings();

        }
@@ -2319,6 +2324,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                updateOrientationListenerLp();

            }



            mUserRotationAngles = Settings.System.getInt(resolver,

                    Settings.System.ACCELEROMETER_ROTATION_ANGLES, -1);



            if (mSystemReady) {

                int pointerLocation = Settings.System.getIntForUser(resolver,

                        Settings.System.POINTER_LOCATION, 0, UserHandle.USER_CURRENT);
@@ -7410,10 +7418,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

                        || orientation == ActivityInfo.SCREEN_ORIENTATION_FULL_USER) {

                // 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;