Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "DO NOT MERGE Remove focus on PasswordTextView"

Browse Source 
This reverts commit 1a96556be5.

Reason for revert: Although it makes sense in terms of UX that the PasswordView need not be highlightable, 
this change caused CTS failures, so we decided to revert this change.

Bug:183644428
Test: atest CtsWindowManagerDeviceTestCases:KeyguardLockedTests && 
atest CtsWindowManagerDeviceTestCases:MultiDisplayLockedKeyguardTests

Change-Id: I57f3d671a7c8430dd02cd7ddb9badbaab242f150
This commit is contained in:
Youngjun Kwak
2021-03-31 01:08:13 +00:00
parent 1a96556be5
commit 44c4a7496e
3 changed files with 2 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/CarSystemUI/res-keyguard/layout-land/keyguard_pin_view.xml
View File

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

2
packages/CarSystemUI/res-keyguard/layout/keyguard_pin_view.xml
View File

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

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

@@ -1,44 +0,0 @@
/*
* 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);
}
}