Merge "Bouncer: Add style in sim pin view." into tm-dev (706e0c71) · Commits · e / os / android_frameworks_base

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"

+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"

+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;

+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);
		}
		}

+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();