From d5b2d818c33fc5b18e5dc8dcd8d1e3f2cebf10ef Mon Sep 17 00:00:00 2001 From: leticiars Date: Fri, 20 Dec 2019 12:22:41 -0500 Subject: [PATCH] Fixing crash happening when password toggle is clicked without the edit text having focus in TalkBack mode. PiperOrigin-RevId: 286590576 (cherry picked from commit 8ed0ab79647374eef3d6b6d2270a00a4f0645803) --- .../material/textfield/PasswordToggleEndIconDelegate.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/java/com/google/android/material/textfield/PasswordToggleEndIconDelegate.java b/lib/java/com/google/android/material/textfield/PasswordToggleEndIconDelegate.java index 1f6ad7fdd..34bb56851 100644 --- a/lib/java/com/google/android/material/textfield/PasswordToggleEndIconDelegate.java +++ b/lib/java/com/google/android/material/textfield/PasswordToggleEndIconDelegate.java @@ -99,7 +99,9 @@ class PasswordToggleEndIconDelegate extends EndIconDelegate { editText.setTransformationMethod(PasswordTransformationMethod.getInstance()); } // And restore the cursor position - editText.setSelection(selection); + if (selection >= 0) { + editText.setSelection(selection); + } } }); textInputLayout.addOnEditTextAttachedListener(onEditTextAttachedListener);