From c94b435b868df59c99c131b69a642b53aa28b623 Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Mon, 28 Sep 2009 15:06:25 -0700 Subject: [PATCH] Fix bug 2142296 where the user couldn't back out of the JetBoy demo. The application was trapping the key up event on the back key. It worked on Donut because the framework implemented the "back" behavior on the key down. The fix consists in sending the key up event on the back button to the Activity class. --- .../com/example/android/jetboy/JetBoy.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/samples/JetBoy/src/com/example/android/jetboy/JetBoy.java b/samples/JetBoy/src/com/example/android/jetboy/JetBoy.java index 21d933c87..d62eb32bb 100755 --- a/samples/JetBoy/src/com/example/android/jetboy/JetBoy.java +++ b/samples/JetBoy/src/com/example/android/jetboy/JetBoy.java @@ -133,19 +133,22 @@ public class JetBoy extends Activity implements View.OnClickListener { */ @Override public boolean onKeyDown(int keyCode, KeyEvent msg) { - - if (keyCode == 4) - super.onKeyDown(keyCode, msg); - - return mJetBoyThread.doKeyDown(keyCode, msg); + if (keyCode == KeyEvent.KEYCODE_BACK) { + return super.onKeyDown(keyCode, msg); + } else { + return mJetBoyThread.doKeyDown(keyCode, msg); + } } /** - * Standard override for key-up. We actually care about these, so we can - * turn off the engine or stop rotating. + * Standard override for key-up. */ @Override public boolean onKeyUp(int keyCode, KeyEvent msg) { - return mJetBoyThread.doKeyUp(keyCode, msg); + if (keyCode == KeyEvent.KEYCODE_BACK) { + return super.onKeyUp(keyCode, msg); + } else { + return mJetBoyThread.doKeyUp(keyCode, msg); + } } }