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

Commit 13bf4fec authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Keyguard: Add accelerometer override to lockscreen" into ics

parents 9e6b0b65 203a2f8e

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

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.graphics.PixelFormat; 
import android.graphics.Canvas;

import android.os.IBinder;

import android.os.SystemProperties;

import android.provider.Settings;

import android.util.Log;

import android.view.View;

import android.view.ViewGroup;
@@ -108,7 +109,7 @@ public class KeyguardViewManager implements KeyguardWindowController { 
        Resources res = mContext.getResources();

        boolean enableScreenRotation =

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

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

                || (res.getBoolean(R.bool.config_enableLockScreenRotation) && (Settings.System.getInt(mContext.getContentResolver(), Settings.System.ACCELEROMETER_ROTATION, 1) != 0));

        if (mKeyguardHost == null) {

            if (DEBUG) Log.d(TAG, "keyguard host is null, creating it...");