PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix focus behavior of ValidatedEditTextPreference" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-09-11 19:52:47 +00:00
committed by Android (Google) Code Review
parent 9a3cb9b835 9be8c3fbfe
commit b8ff97fbd5
2 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/settings/widget/ValidatedEditTextPreference.java
View File

@@ -21,8 +21,10 @@ import android.content.Context;
import android.support.annotation.VisibleForTesting;
import android.text.Editable;
import android.text.InputType;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.util.AttributeSet;
import android.util.Log;
import android.view.View;
import android.widget.EditText;
@@ -61,17 +63,18 @@ public class ValidatedEditTextPreference extends CustomEditTextPreference {
@Override
protected void onBindDialogView(View view) {
super.onBindDialogView(view);
if (mValidator != null) {
final EditText editText = view.findViewById(android.R.id.edit);
if (editText != null) {
editText.removeTextChangedListener(mTextWatcher);
if (mIsPassword) {
editText.setInputType(
InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
editText.setMaxLines(1);
}
editText.addTextChangedListener(mTextWatcher);
final EditText editText = view.findViewById(android.R.id.edit);
if (editText != null && !TextUtils.isEmpty(editText.getText())) {
editText.setSelection(editText.getText().length());
}
if (mValidator != null && editText != null) {
editText.removeTextChangedListener(mTextWatcher);
if (mIsPassword) {
editText.setInputType(
InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
editText.setMaxLines(1);
}
editText.addTextChangedListener(mTextWatcher);
}
}