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

Merge "Fix several accessibility issues with BiometricPrompt" into qt-dev

Browse Source
This commit is contained in:
Kevin Chyn
2019-05-14 23:21:08 +00:00
committed by Android (Google) Code Review
parent 8343ad4285 8ab1de6804
commit 8575ede8fc
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/layout/biometric_dialog.xml
View File

@@ -37,7 +37,8 @@
android:id="@+id/space" android:id="@+id/space"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" /> android:layout_weight="1"
android:contentDescription="@string/biometric_dialog_empty_space_description"/>
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"

4
packages/SystemUI/res/values/strings.xml
View File

@@ -288,8 +288,10 @@
<!-- Message shown when a biometric is authenticated, asking the user to confirm authentication [CHAR LIMIT=30] --> <!-- Message shown when a biometric is authenticated, asking the user to confirm authentication [CHAR LIMIT=30] -->
<string name="biometric_dialog_confirm">Confirm</string> <string name="biometric_dialog_confirm">Confirm</string>
<!-- Button name on BiometricPrompt shown when a biometric is detected but not authenticated. Tapping the button resumes authentication [CHAR_LIMIT=30] --> <!-- Button name on BiometricPrompt shown when a biometric is detected but not authenticated. Tapping the button resumes authentication [CHAR LIMIT=30] -->
<string name="biometric_dialog_try_again">Try again</string> <string name="biometric_dialog_try_again">Try again</string>
<!-- Content description for empty spaces that are not taken by the biometric dialog. Clicking on these areas will cancel authentication and dismiss the biometric dialog [CHAR LIMIT=NONE] -->
<string name="biometric_dialog_empty_space_description">Empty region, tap to cancel authentication</string>
<!-- Message shown when the system-provided fingerprint dialog is shown, asking for authentication --> <!-- Message shown when the system-provided fingerprint dialog is shown, asking for authentication -->
<string name="fingerprint_dialog_touch_sensor">Touch the fingerprint sensor</string> <string name="fingerprint_dialog_touch_sensor">Touch the fingerprint sensor</string>

8
packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogView.java
View File

@@ -33,7 +33,6 @@ import android.util.DisplayMetrics;
import android.util.Log; import android.util.Log;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.WindowManager; import android.view.WindowManager;
@@ -228,9 +227,6 @@ public abstract class BiometricDialogView extends LinearLayout {
showTryAgainButton(false /* show */); showTryAgainButton(false /* show */);
mCallback.onTryAgainPressed(); mCallback.onTryAgainPressed();
}); });
mLayout.setFocusableInTouchMode(true);
mLayout.requestFocus();
} }
public void onSaveState(Bundle bundle) { public void onSaveState(Bundle bundle) {
@@ -278,7 +274,6 @@ public abstract class BiometricDialogView extends LinearLayout {
mTitleText.setVisibility(View.VISIBLE); mTitleText.setVisibility(View.VISIBLE);
mTitleText.setText(titleText); mTitleText.setText(titleText);
mTitleText.setSelected(true);
final CharSequence subtitleText = mBundle.getCharSequence(BiometricPrompt.KEY_SUBTITLE); final CharSequence subtitleText = mBundle.getCharSequence(BiometricPrompt.KEY_SUBTITLE);
if (TextUtils.isEmpty(subtitleText)) { if (TextUtils.isEmpty(subtitleText)) {
@@ -323,11 +318,10 @@ public abstract class BiometricDialogView extends LinearLayout {
private void setDismissesDialog(View v) { private void setDismissesDialog(View v) {
v.setClickable(true); v.setClickable(true);
v.setOnTouchListener((View view, MotionEvent event) -> { v.setOnClickListener(v1 -> {
if (mState != STATE_AUTHENTICATED && shouldGrayAreaDismissDialog()) { if (mState != STATE_AUTHENTICATED && shouldGrayAreaDismissDialog()) {
mCallback.onUserCanceled(); mCallback.onUserCanceled();
} }
return true;
}); });
} }