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

Use ImeAwareEditText in FingerprintSettings

Browse Source 
Like we did the same thing in the Settings app [1][2][3],
FingerprintSetting is another instance that should use
ImeAwareEditText to make sure InputMethodManager#showSoftInput() is
called after the EditText gains IME focus.

This approach should be more robust and easier to maintain than trying
to control the software keyboard visibility with
SOFT_INPUT_STATE_ALWAYS_VISIBLE, which is more complicated that people
think.

This CL also removes RenameDialog#mTextHadFocus since
RenameDialog#mDialogTextField is always focused when the dialog is
shown [4].

This CL also removes the following fields since they can just be a
local final variables that will be captured into callback.

 * RenameDialog#mFingerName
 * RenameDialog#mTextSelectionStart
 * RenameDialog#mTextSelectionEnd

 [1]: I182b05d3ff59fb3b4732d60d0d5a464f0e0e0235
      f6af093e2d
 [2]: I892d639f3cc5d43db553b682d5278b8ce2fe72da
      4803267106
 [3]: Ib75ba0f361b8b46c3b717cc1ffb864726958ed82
      b0bcbed372
 [4]: I5bb1b7227c1323595bf7f483e11e87e2c3550093
      7a1d52eb06

Fix: 118473687
Test: Manually verified as follows.
      1. Build and flash aosp_taimen-userdebug to Taimen
      2. Set up a fingerprint unlock.
      3. Rotate the device to landscape mode.
      4. Open Settings -> Security & location -> Fingerprint
      5. Re-enter password if necessary
      6. Tap "Finger 1"
      7. Make sure that AOSP Keyboard shows up
Change-Id: I2a137aa8f6a1ee2b67923bcf40e82320a56c7b59
This commit is contained in:
Yohei Yukawa
2018-10-29 13:09:12 -07:00
parent 798dd76ca5
commit af4426bb65
2 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/fingerprint_rename_dialog.xml
View File

@@ -35,7 +35,7 @@
android:clipChildren="false"
android:clipToPadding="false" />
<EditText
<com.android.settings.widget.ImeAwareEditText
android:id="@+id/fingerprint_rename_field"
android:layout_width="match_parent"
android:layout_height="wrap_content"

39
src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
View File

@@ -55,6 +55,7 @@ import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.password.ChooseLockGeneric;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.utils.AnnotationSpan;
import com.android.settings.widget.ImeAwareEditText;
import com.android.settingslib.HelpUtils;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -708,11 +709,7 @@ public class FingerprintSettings extends SubSettings {
public static class RenameDialog extends InstrumentedDialogFragment {
private Fingerprint mFp;
private EditText mDialogTextField;
private String mFingerName;
private Boolean mTextHadFocus;
private int mTextSelectionStart;
private int mTextSelectionEnd;
private ImeAwareEditText mDialogTextField;
private AlertDialog mAlertDialog;
private boolean mDeleteInProgress;
@@ -723,11 +720,17 @@ public class FingerprintSettings extends SubSettings {
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
mFp = getArguments().getParcelable("fingerprint");
final String fingerName;
final int textSelectionStart;
final int textSelectionEnd;
if (savedInstanceState != null) {
mFingerName = savedInstanceState.getString("fingerName");
mTextHadFocus = savedInstanceState.getBoolean("textHadFocus");
mTextSelectionStart = savedInstanceState.getInt("startSelection");
mTextSelectionEnd = savedInstanceState.getInt("endSelection");
fingerName = savedInstanceState.getString("fingerName");
textSelectionStart = savedInstanceState.getInt("startSelection", -1);
textSelectionEnd = savedInstanceState.getInt("endSelection", -1);
} else {
fingerName = null;
textSelectionStart = -1;
textSelectionEnd = -1;
}
mAlertDialog = new AlertDialog.Builder(getActivity())
.setView(R.layout.fingerprint_rename_dialog)
@@ -756,26 +759,21 @@ public class FingerprintSettings extends SubSettings {
mAlertDialog.setOnShowListener(new DialogInterface.OnShowListener() {
@Override
public void onShow(DialogInterface dialog) {
mDialogTextField = (EditText) mAlertDialog.findViewById(
R.id.fingerprint_rename_field);
CharSequence name = mFingerName == null ? mFp.getName() : mFingerName;
mDialogTextField = mAlertDialog.findViewById(R.id.fingerprint_rename_field);
CharSequence name = fingerName == null ? mFp.getName() : fingerName;
mDialogTextField.setText(name);
if (mTextHadFocus == null) {
mDialogTextField.selectAll();
if (textSelectionStart != -1 && textSelectionEnd != -1) {
mDialogTextField.setSelection(textSelectionStart, textSelectionEnd);
} else {
mDialogTextField.setSelection(mTextSelectionStart, mTextSelectionEnd);
mDialogTextField.selectAll();
}
if (mDeleteInProgress) {
mAlertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(false);
}
mDialogTextField.requestFocus();
mDialogTextField.scheduleShowSoftInput();
}
});
if (mTextHadFocus == null || mTextHadFocus) {
// Request the IME
mAlertDialog.getWindow().setSoftInputMode(
WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
}
return mAlertDialog;
}
@@ -791,7 +789,6 @@ public class FingerprintSettings extends SubSettings {
super.onSaveInstanceState(outState);
if (mDialogTextField != null) {
outState.putString("fingerName", mDialogTextField.getText().toString());
outState.putBoolean("textHadFocus", mDialogTextField.hasFocus());
outState.putInt("startSelection", mDialogTextField.getSelectionStart());
outState.putInt("endSelection", mDialogTextField.getSelectionEnd());
}