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

Commit 3e8dd849 authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "Bouncer: Add style in sim pin view." into tm-dev am: 706e0c71 am: e786b33b 

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



Change-Id: I62fe539818d1159e8d0b5f7bca5d11bc60003462
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 75554a88 e786b33b

packages/SystemUI/res-keyguard/layout/keyguard_sim_pin_view.xml

+10 −9
Original line number Diff line number Diff line
@@ -59,16 +59,17 @@ 
                android:layout_height="wrap_content"

                android:paddingBottom="4dp"

                >



            <com.android.keyguard.PasswordTextView

                android:id="@+id/simPinEntry"

                style="@style/Widget.TextView.Password"

                android:layout_width="@dimen/keyguard_security_width"

                android:layout_height="@dimen/keyguard_password_height"

                    android:gravity="center"

                android:layout_centerHorizontal="true"

                android:layout_marginRight="72dp"

                    androidprv:scaledTextSize="@integer/scaled_password_text_size"

                android:contentDescription="@string/keyguard_accessibility_sim_pin_area"

                    />

                android:gravity="center"

                androidprv:scaledTextSize="@integer/scaled_password_text_size" />

        </RelativeLayout>

        <LinearLayout

                android:layout_width="wrap_content"

packages/SystemUI/res-keyguard/layout/keyguard_sim_puk_view.xml

+10 −9
Original line number Diff line number Diff line
@@ -60,16 +60,17 @@ 
                android:layout_height="wrap_content"

                android:paddingBottom="4dp"

                >



            <com.android.keyguard.PasswordTextView

                android:id="@+id/pukEntry"

                style="@style/Widget.TextView.Password"

                android:layout_width="@dimen/keyguard_security_width"

                android:layout_height="@dimen/keyguard_password_height"

                    android:gravity="center"

                android:layout_centerHorizontal="true"

                android:layout_marginRight="72dp"

                    androidprv:scaledTextSize="@integer/scaled_password_text_size"

                android:contentDescription="@string/keyguard_accessibility_sim_puk_area"

                    />

                android:gravity="center"

                androidprv:scaledTextSize="@integer/scaled_password_text_size" />

        </RelativeLayout>

        <LinearLayout

                android:layout_width="wrap_content"

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

+4 −4
Original line number Diff line number Diff line
@@ -123,10 +123,10 @@ public class KeyguardSecurityViewFlipperController 


    private int getLayoutIdFor(SecurityMode securityMode) {

        switch (securityMode) {

            case Pattern: return com.android.systemui.R.layout.keyguard_pattern_view;

            case PIN: return com.android.systemui.R.layout.keyguard_pin_view;

            case Password: return com.android.systemui.R.layout.keyguard_password_view;

            case SimPin: return com.android.systemui.R.layout.keyguard_sim_pin_view;

            case Pattern: return R.layout.keyguard_pattern_view;

            case PIN: return R.layout.keyguard_pin_view;

            case Password: return R.layout.keyguard_password_view;

            case SimPin: return R.layout.keyguard_sim_pin_view;

            case SimPuk: return R.layout.keyguard_sim_puk_view;

            default:

                return 0;

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

+19 −0
Original line number Diff line number Diff line
@@ -18,8 +18,13 @@ package com.android.keyguard; 


import android.content.Context;

import android.content.res.Configuration;

import android.content.res.TypedArray;

import android.graphics.drawable.Drawable;

import android.util.AttributeSet;

import android.view.View;

import android.widget.ImageView;



import androidx.core.graphics.drawable.DrawableCompat;



import com.android.systemui.R;
@@ -27,6 +32,7 @@ import com.android.systemui.R; 
 * Displays a PIN pad for unlocking.

 */

public class KeyguardSimPinView extends KeyguardPinBasedInputView {

    private ImageView mSimImageView;

    public static final String TAG = "KeyguardSimPinView";



    public KeyguardSimPinView(Context context) {
@@ -62,6 +68,7 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { 


    @Override

    protected void onFinishInflate() {

        mSimImageView = findViewById(R.id.keyguard_sim);

        super.onFinishInflate();



        if (mEcaView instanceof EmergencyCarrierArea) {
@@ -79,5 +86,17 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { 
        return getContext().getString(

                com.android.internal.R.string.keyguard_accessibility_sim_pin_unlock);

    }



    @Override

    public void reloadColors() {

        super.reloadColors();



        int[] customAttrs = {android.R.attr.textColorSecondary};

        TypedArray a = getContext().obtainStyledAttributes(customAttrs);

        int imageColor = a.getColor(0, 0);

        a.recycle();

        Drawable wrappedDrawable = DrawableCompat.wrap(mSimImageView.getDrawable());

        DrawableCompat.setTint(wrappedDrawable, imageColor);

    }

}

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

+6 −0
Original line number Diff line number Diff line
@@ -130,6 +130,12 @@ public class KeyguardSimPinViewController 
        }

    }



    @Override

    public void reloadColors() {

        super.reloadColors();

        mView.reloadColors();

    }



    @Override

    protected void verifyPasswordAndUnlock() {

        String entry = mPasswordEntry.getText();