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

Merge "Bluetooth : fix for handling back key during pair dialog display"

Browse Source
This commit is contained in:
Jake Hamby
2011-08-09 13:29:12 -07:00
committed by Android (Google) Code Review
parent ce477dbd83 aaf8ffff79
commit 5fa5be2f71
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/bluetooth/BluetoothPairingDialog.java
View File

@@ -41,6 +41,7 @@ import android.widget.TextView;
import com.android.internal.app.AlertActivity; import com.android.internal.app.AlertActivity;
import com.android.internal.app.AlertController; import com.android.internal.app.AlertController;
import com.android.settings.R; import com.android.settings.R;
import android.view.KeyEvent;
/** /**
* BluetoothPairingDialog asks the user to enter a PIN / Passkey / simple confirmation * BluetoothPairingDialog asks the user to enter a PIN / Passkey / simple confirmation
@@ -340,6 +341,13 @@ public final class BluetoothPairingDialog extends AlertActivity implements
mDevice.cancelPairingUserInput(); mDevice.cancelPairingUserInput();
} }
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK) {
onCancel();
}
return super.onKeyDown(keyCode,event);
}
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
switch (which) { switch (which) {
case BUTTON_POSITIVE: case BUTTON_POSITIVE: