moparisthebest
/
Yaaic
mirror of https://github.com/moparisthebest/Yaaic
1
0
Fork 0
Code Issues Releases Wiki Activity

ConversationActivity: Small changes in onKeyDown() (also removed onBackPressed())

This commit is contained in:
Sebastian Kaspari 2010-03-24 18:44:17 +01:00
parent 8bfe1d1a75
commit 6e2c835869
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/org/yaaic/view/ConversationActivity.java
View File

@ -271,7 +271,9 @@ public class ConversationActivity extends Activity implements ServiceConnection,
deckAdapter.removeItem(target);
if (deckAdapter.isSwitched()) {
onBackPressed();
switcher.showNext();
switcher.removeView(deckAdapter.getSwitchedView());
deckAdapter.setSwitched(null, null);
}
}
@ -309,32 +311,21 @@ public class ConversationActivity extends Activity implements ServiceConnection,
/**
* On key down
*
* This is glue code to call onBackPressed() which
* will be automatically called by later android releases
*
* XXX: As we only track the back key: Android >= 2.0 will call a method called onBackPressed()
*/
@Override
public boolean onKeyDown(int keyCode, KeyEvent event)
{
if (keyCode == KeyEvent.KEYCODE_BACK) {
onBackPressed();
return true;
}
return false;
}
/**
* On back key pressed
*/
public void onBackPressed()
{
if (deckAdapter.isSwitched()) {
switcher.showNext();
switcher.removeView(deckAdapter.getSwitchedView());
deckAdapter.setSwitched(null, null);
} else {
finish();
if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0) {
if (deckAdapter.isSwitched()) {
switcher.showNext();
switcher.removeView(deckAdapter.getSwitchedView());
deckAdapter.setSwitched(null, null);
return true;
}
}
return super.onKeyDown(keyCode, event);
}
/**