From 1a96556be5263ec82a3b4beef9f247ec0546e6bd Mon Sep 17 00:00:00 2001
From: Heemin Seog <hseog@google.com>
Date: Tue, 9 Mar 2021 20:12:58 +0000
Subject: [PATCH] DO NOT MERGE Remove focus on PasswordTextView

Because we provide a PIN pad, the passwordTextView does not need to be
focusable.

Bug: 182211814
Test: manual
Change-Id: Ib0ed8c0bf6c0fd70f750e093b1fb64134866d442
---
 .../layout-land/keyguard_pin_view.xml         |  2 +-
 .../res-keyguard/layout/keyguard_pin_view.xml |  2 +-
 .../keyguard/UnfocusablePasswordTextView.java | 44 +++++++++++++++++++
 3 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 packages/CarSystemUI/src/com/android/systemui/car/keyguard/UnfocusablePasswordTextView.java

diff --git a/packages/CarSystemUI/res-keyguard/layout-land/keyguard_pin_view.xml b/packages/CarSystemUI/res-keyguard/layout-land/keyguard_pin_view.xml
index 5746102f5f275..189f33140d41b 100644
--- a/packages/CarSystemUI/res-keyguard/layout-land/keyguard_pin_view.xml
+++ b/packages/CarSystemUI/res-keyguard/layout-land/keyguard_pin_view.xml
@@ -55,7 +55,7 @@
         android:gravity="center"
         android:orientation="vertical">
 
-        <com.android.keyguard.PasswordTextView
+        <com.android.systemui.car.keyguard.UnfocusablePasswordTextView
             android:id="@+id/pinEntry"
             android:layout_width="@dimen/keyguard_security_width"
             android:layout_height="@dimen/pin_entry_height"
diff --git a/packages/CarSystemUI/res-keyguard/layout/keyguard_pin_view.xml b/packages/CarSystemUI/res-keyguard/layout/keyguard_pin_view.xml
index 815e67d1e2780..51b42ab2af7cb 100644
--- a/packages/CarSystemUI/res-keyguard/layout/keyguard_pin_view.xml
+++ b/packages/CarSystemUI/res-keyguard/layout/keyguard_pin_view.xml
@@ -42,7 +42,7 @@
             android:gravity="center"
             android:orientation="vertical">
 
-            <com.android.keyguard.PasswordTextView
+            <com.android.systemui.car.keyguard.UnfocusablePasswordTextView
                 android:id="@+id/pinEntry"
                 android:layout_width="@dimen/keyguard_security_width"
                 android:layout_height="@dimen/pin_entry_height"
diff --git a/packages/CarSystemUI/src/com/android/systemui/car/keyguard/UnfocusablePasswordTextView.java b/packages/CarSystemUI/src/com/android/systemui/car/keyguard/UnfocusablePasswordTextView.java
new file mode 100644
index 0000000000000..971e338e45d84
--- /dev/null
+++ b/packages/CarSystemUI/src/com/android/systemui/car/keyguard/UnfocusablePasswordTextView.java
@@ -0,0 +1,44 @@
+/*
+ * 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);
+    }
+}