diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigActivity.java index 241aced1c..394153f9a 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigActivity.java @@ -20,9 +20,7 @@ package org.eehouse.android.xw4; -import android.app.Activity; import android.os.Bundle; -import android.view.KeyEvent; public class GameConfigActivity extends XWActivity { @@ -34,11 +32,4 @@ public class GameConfigActivity extends XWActivity { m_dlgt = new GameConfigDelegate( this, savedInstanceState ); super.onCreate( savedInstanceState, m_dlgt ); } // onCreate - - @Override - public boolean onKeyDown( int keyCode, KeyEvent event ) - { - boolean consumed = m_dlgt.onKeyDown( keyCode, event ); - return consumed || super.onKeyDown( keyCode, event ); - } } diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigDelegate.java index d169d3bdc..83c1a5b53 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigDelegate.java @@ -725,12 +725,11 @@ public class GameConfigDelegate extends DelegateBase } } // onClick - protected boolean onKeyDown( int keyCode, KeyEvent event ) + @Override + protected boolean onBackPressed() { boolean consumed = false; - if ( null == m_gameLock ) { - // Do nothing; we're on our way out - } else if ( keyCode == KeyEvent.KEYCODE_BACK ) { + if ( null != m_gameLock ) { if ( m_forResult ) { deleteGame(); } else { diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java index 3b0bd0137..c55bbc7c1 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java @@ -1207,7 +1207,8 @@ public class GamesListDelegate extends ListDelegateBase } @Override - protected boolean onBackPressed() { + protected boolean onBackPressed() + { boolean handled = 0 < m_selGames.size() || 0 < m_selGroupIDs.size(); if ( handled ) { showNotAgainDlgThen( R.string.not_again_backclears,