Merge "Revert "DO NOT MERGE Remove focus on PasswordTextView"" into rvc-qpr-dev (3c8e0904) · Commits · e / os / android_frameworks_base

packages/CarSystemUI/res-keyguard/layout-land/keyguard_pin_view.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@
		android:gravity="center"
		android:orientation="vertical">

		<com.android.systemui.car.keyguard.UnfocusablePasswordTextView
		<com.android.keyguard.PasswordTextView
		android:id="@+id/pinEntry"
		android:layout_width="@dimen/keyguard_security_width"
		android:layout_height="@dimen/pin_entry_height"

+1 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@
		android:gravity="center"
		android:orientation="vertical">

		<com.android.systemui.car.keyguard.UnfocusablePasswordTextView
		<com.android.keyguard.PasswordTextView
		android:id="@+id/pinEntry"
		android:layout_width="@dimen/keyguard_security_width"
		android:layout_height="@dimen/pin_entry_height"

deleted100644 → 0

+0 −44

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.car.keyguard;

		import android.content.Context;
		import android.util.AttributeSet;

		import com.android.keyguard.PasswordTextView;

		/** A version of {@link PasswordTextView} that is not focusable. */
		public class UnfocusablePasswordTextView extends PasswordTextView {
		public UnfocusablePasswordTextView(Context context) {
		this(context, null);
		}

		public UnfocusablePasswordTextView(Context context, AttributeSet attrs) {
		this(context, attrs, 0);
		}

		public UnfocusablePasswordTextView(Context context, AttributeSet attrs, int defStyleAttr) {
		this(context, attrs, defStyleAttr, 0);
		}

		public UnfocusablePasswordTextView(Context context, AttributeSet attrs, int defStyleAttr,
		int defStyleRes) {
		super(context, attrs, defStyleAttr, defStyleRes);
		setFocusableInTouchMode(false);
		setFocusable(false);
		}
		}