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

Commit 6a2a6731 authored by Youngjun Kwak's avatar Youngjun Kwak Committed by Automerger Merge Worker
Browse files

Revert "DO NOT MERGE Remove focus on PasswordTextView" am: 44c4a749 

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

Change-Id: Ibc742115ba929cbb22ac2f004ad96c2e55f40852
parents 5b1b6bf2 44c4a749

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"

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

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

packages/CarSystemUI/src/com/android/systemui/car/keyguard/UnfocusablePasswordTextView.java

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

    }

}