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

Commit 6486dcc7 authored by Oliver Scott's avatar Oliver Scott Committed by Luca Stefani
Browse files

Revert "SystemUI: Read PIN scramble setting from current user" 

This reverts commit 080ff6c243664d45a05e58a2331f808fc79c2755.

Change-Id: Ia056354417a9aa9ca2f161816bbf8bb905af69bc
parent 7d6dbea4

packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java

+2 −4
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.keyguard; 


import android.content.Context;

import android.content.res.Configuration;

import android.os.UserHandle;

import android.util.AttributeSet;

import android.view.View;

import android.view.ViewGroup;
@@ -150,9 +149,8 @@ public class KeyguardPINView extends KeyguardPinBasedInputView { 
                        null, mEcaView, null

                }};



        mScramblePin = LineageSettings.System.getIntForUser(getContext().getContentResolver(),

                LineageSettings.System.LOCKSCREEN_PIN_SCRAMBLE_LAYOUT, 0,

                UserHandle.USER_CURRENT) == 1;

        mScramblePin = LineageSettings.System.getInt(getContext().getContentResolver(),

                LineageSettings.System.LOCKSCREEN_PIN_SCRAMBLE_LAYOUT, 0) == 1;

        if (mScramblePin) {

            Collections.shuffle(sNumbers);

            // get all children who are NumPadKey's

packages/SystemUI/src/com/android/keyguard/NumPadKey.java

+2 −4
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.graphics.drawable.Drawable; 
import android.graphics.drawable.RippleDrawable;

import android.os.PowerManager;

import android.os.SystemClock;

import android.os.UserHandle;

import android.util.AttributeSet;

import android.view.HapticFeedbackConstants;

import android.view.LayoutInflater;
@@ -135,9 +134,8 @@ public class NumPadKey extends ViewGroup { 
    }



    private void updateText() {

       boolean scramblePin = LineageSettings.System.getIntForUser(getContext().getContentResolver(),

                LineageSettings.System.LOCKSCREEN_PIN_SCRAMBLE_LAYOUT, 0,

                UserHandle.USER_CURRENT) == 1;

       boolean scramblePin = (LineageSettings.System.getInt(getContext().getContentResolver(),

                LineageSettings.System.LOCKSCREEN_PIN_SCRAMBLE_LAYOUT, 0) == 1);

        if (mDigit >= 0) {

            mDigitText.setText(Integer.toString(mDigit));

            if (sKlondike == null) {