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

Commit bb0c0ab9 authored by Kelly's avatar Kelly Committed by Gerrit Code Review
Browse files

Add lockscreen rotation as an optional rotation setting (1/2) 



This will allow the user to select wether or not to use the
rotation settings for the lockscreen.  This is dependent
upon the rotation setting being checked.

Forward port from cm-10.2, adjusted for 4.4

Signed-off-by: default avatarMichael Bestas <mikeioannina@gmail.com>

Change-Id: Ibd7c69b0af1e0a7d91b985f2b21ea0b5bc619a70
JIRA: CYAN-339
parent c7f1c3f5

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -2331,6 +2331,13 @@ public final class Settings { 
         */

        public static final String ACCELEROMETER_ROTATION = "accelerometer_rotation";



        /**

         * Control whether the accelerometer will be used to change lockscreen

         * orientation.  If 0, it will not be used; if 1, it will be used by default.

         * @hide

         */

        public static final String LOCKSCREEN_ROTATION = "lockscreen_rotation";



        /**

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

         * if ACCELEROMETER_ROTATION is enabled.
@@ -3386,6 +3393,7 @@ public final class Settings { 
            TIME_12_24,

            DATE_FORMAT,

            ACCELEROMETER_ROTATION,

            LOCKSCREEN_ROTATION,

            USER_ROTATION,

            DTMF_TONE_WHEN_DIALING,

            DTMF_TONE_TYPE_WHEN_DIALING,

packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java

+6 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.os.IBinder; 
import android.os.Parcelable;

import android.os.RemoteException;

import android.os.SystemProperties;

import android.provider.Settings;

import android.util.Log;

import android.util.Slog;

import android.util.SparseArray;
@@ -142,8 +143,12 @@ public class KeyguardViewManager { 


    private boolean shouldEnableScreenRotation() {

        Resources res = mContext.getResources();

        boolean enableLockScreenRotation = Settings.System.getInt(mContext.getContentResolver(),

                Settings.System.LOCKSCREEN_ROTATION, 0) != 0;

        boolean enableAccelerometerRotation = Settings.System.getInt(mContext.getContentResolver(),

                Settings.System.ACCELEROMETER_ROTATION, 1) != 0;

        return SystemProperties.getBoolean("lockscreen.rot_override",false)

                || res.getBoolean(R.bool.config_enableLockScreenRotation);

                || (enableLockScreenRotation && enableAccelerometerRotation);

    }



    private boolean shouldEnableTranslucentDecor() {