LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 8c77415e: Merge change Ic94b435b into eclair

Browse Source 
Merge commit '8c77415ede684d89b738b3cf6cdaeaacd541eb87' into eclair-plus-aosp

* commit '8c77415ede684d89b738b3cf6cdaeaacd541eb87':
  Fix bug 2142296 where the user couldn't back out of the JetBoy demo.
This commit is contained in:
Jean-Michel Trivi
2009-09-28 15:23:31 -07:00
committed by Android Git Automerger
parent ebe66dfea9 8c77415ede
commit 2296cfbd37
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
samples/JetBoy/src/com/example/android/jetboy/JetBoy.java
View File

@@ -133,19 +133,22 @@ public class JetBoy extends Activity implements View.OnClickListener {
*/ */
@Override @Override
public boolean onKeyDown(int keyCode, KeyEvent msg) { public boolean onKeyDown(int keyCode, KeyEvent msg) {
if (keyCode == KeyEvent.KEYCODE_BACK) {
if (keyCode == 4) return super.onKeyDown(keyCode, msg);
super.onKeyDown(keyCode, msg); } else {
return mJetBoyThread.doKeyDown(keyCode, msg); return mJetBoyThread.doKeyDown(keyCode, msg);
} }
}
/** /**
* Standard override for key-up. We actually care about these, so we can * Standard override for key-up.
* turn off the engine or stop rotating.
*/ */
@Override @Override
public boolean onKeyUp(int keyCode, KeyEvent msg) { public boolean onKeyUp(int keyCode, KeyEvent msg) {
if (keyCode == KeyEvent.KEYCODE_BACK) {
return super.onKeyUp(keyCode, msg);
} else {
return mJetBoyThread.doKeyUp(keyCode, msg); return mJetBoyThread.doKeyUp(keyCode, msg);
} }
} }
}