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

Merge "Make sure PIN edit control is focused" into oc-dr1-dev

Browse Source 
am: 61e61d96d1

Change-Id: Ib144b0ad110528d4d72fb15c5e463f0b24d5baed
This commit is contained in:
Antony Sargent
2017-07-13 19:54:27 +00:00
committed by android-build-merger
parent cc6a61a958 61e61d96d1
commit d1b5116213
3 changed files with 51 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
View File

@@ -17,6 +17,7 @@ package com.android.settings.bluetooth;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
import android.os.Bundle;
@@ -27,10 +28,12 @@ import android.text.InputType;
import android.text.TextWatcher;
import android.util.Log;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -192,7 +195,16 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i
mBuilder.setPositiveButton(getString(android.R.string.ok), this);
mBuilder.setNegativeButton(getString(android.R.string.cancel), this);
AlertDialog dialog = mBuilder.create();
dialog.setOnShowListener(d -> mDialog.getButton(Dialog.BUTTON_POSITIVE).setEnabled(false));
dialog.setOnShowListener(d -> {
mDialog.getButton(Dialog.BUTTON_POSITIVE).setEnabled(false);
if (mPairingView != null && mPairingView.requestFocus()) {
InputMethodManager imm = (InputMethodManager)
getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
if (imm != null) {
imm.showSoftInput(mPairingView, InputMethodManager.SHOW_IMPLICIT);
}
}
});
return dialog;
}