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

Commit 9e40a9ff authored by Heemin Seog's avatar Heemin Seog Committed by Automerger Merge Worker
Browse files

Merge "Fix broken keyguard in car sysui" into sc-dev am: 1fcb030d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13831522

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I262cd791d32f976f40bb02a564cf0f731b031b8a
parents 4d12e46f 1fcb030d

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

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


import android.content.Context;

import android.content.res.ColorStateList;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.LayerDrawable;

import android.graphics.drawable.VectorDrawable;

import android.util.AttributeSet;
@@ -24,6 +25,8 @@ import android.view.ContextThemeWrapper; 
import android.view.MotionEvent;

import android.view.ViewGroup;



import androidx.annotation.Nullable;



import com.android.settingslib.Utils;

import com.android.systemui.R;
@@ -32,13 +35,19 @@ import com.android.systemui.R; 
 */

public class NumPadButton extends AlphaOptimizedImageButton {



    @Nullable

    private NumPadAnimator mAnimator;



    public NumPadButton(Context context, AttributeSet attrs) {

        super(context, attrs);



        mAnimator = new NumPadAnimator(context, (LayerDrawable) getBackground(),

        Drawable background = getBackground();

        if (background instanceof LayerDrawable) {

            mAnimator = new NumPadAnimator(context, (LayerDrawable) background,

                    attrs.getStyleAttribute());

        } else {

            mAnimator = null;

        }

    }



    @Override
@@ -93,9 +102,11 @@ public class NumPadButton extends AlphaOptimizedImageButton { 
     * By default, the new layout will be enabled. Invoking will revert to the old style

     */

    public void disableNewLayout() {

        if (mAnimator != null) {

            mAnimator = null;

            ContextThemeWrapper ctw = new ContextThemeWrapper(getContext(), R.style.NumPadKey);

            setBackground(getContext().getResources().getDrawable(

                    R.drawable.ripple_drawable_pin, ctw.getTheme()));

        }

    }

}

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

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


import android.content.Context;

import android.content.res.TypedArray;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.LayerDrawable;

import android.os.PowerManager;

import android.os.SystemClock;
@@ -31,6 +32,8 @@ import android.view.ViewGroup; 
import android.view.accessibility.AccessibilityManager;

import android.widget.TextView;



import androidx.annotation.Nullable;



import com.android.internal.widget.LockPatternUtils;

import com.android.settingslib.Utils;

import com.android.systemui.R;
@@ -48,6 +51,7 @@ public class NumPadKey extends ViewGroup { 
    private int mTextViewResId;

    private PasswordTextView mTextView;



    @Nullable

    private NumPadAnimator mAnimator;



    private View.OnClickListener mListener = new View.OnClickListener() {
@@ -127,8 +131,13 @@ public class NumPadKey extends ViewGroup { 


        setContentDescription(mDigitText.getText().toString());



        mAnimator = new NumPadAnimator(context, (LayerDrawable) getBackground(),

        Drawable background = getBackground();

        if (background instanceof LayerDrawable) {

            mAnimator = new NumPadAnimator(context, (LayerDrawable) background,

                    R.style.NumPadKey);

        } else {

            mAnimator = null;

        }

    }



    /**
@@ -136,11 +145,13 @@ public class NumPadKey extends ViewGroup { 
     */

    public void disableNewLayout() {

        findViewById(R.id.klondike_text).setVisibility(View.VISIBLE);

        if (mAnimator != null) {

            mAnimator = null;

            ContextThemeWrapper ctw = new ContextThemeWrapper(getContext(), R.style.NumPadKey);

            setBackground(getContext().getResources().getDrawable(

                    R.drawable.ripple_drawable_pin, ctw.getTheme()));

        }

    }



    /**

     * Reload colors from resources.

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

+13 −3
Original line number Diff line number Diff line
@@ -121,9 +121,19 @@ public class PasswordTextView extends View { 
    public PasswordTextView(Context context, AttributeSet attrs, int defStyleAttr,

            int defStyleRes) {

        super(context, attrs, defStyleAttr, defStyleRes);

        setFocusableInTouchMode(true);

        setFocusable(true);

        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.PasswordTextView);

        TypedArray a = context.obtainStyledAttributes(attrs, android.R.styleable.View);

        try {

            // If defined, use the provided values. If not, set them to true by default.

            boolean isFocusable = a.getBoolean(android.R.styleable.View_focusable,

                    /* defValue= */ true);

            boolean isFocusableInTouchMode = a.getBoolean(

                    android.R.styleable.View_focusableInTouchMode, /* defValue= */ true);

            setFocusable(isFocusable);

            setFocusableInTouchMode(isFocusableInTouchMode);

        } finally {

            a.recycle();

        }

        a = context.obtainStyledAttributes(attrs, R.styleable.PasswordTextView);

        try {

            mTextHeightRaw = a.getInt(R.styleable.PasswordTextView_scaledTextSize, 0);

            mGravity = a.getInt(R.styleable.PasswordTextView_android_gravity, Gravity.CENTER);