Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-27 07:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

move onBackPressed() into activity superclasses

Browse source
This commit is contained in:
Eric House 2014-05-29 07:15:34 -07:00
parent 092c0f54c8
commit a6205f3dca
9 changed files with 18 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
xwords4/android/XWords4/src/org/eehouse/android/xw4/DelegateBase.java
View file

@ -65,6 +65,7 @@ public class DelegateBase implements DlgDelegate.DlgClickNotify,
protected void onPause() {}
protected void onStop() {}
protected void onDestroy() {}
protected boolean onBackPressed() { return false; }
protected void prepareDialog( int id, Dialog dialog ) {}
// public boolean onOptionsItemSelected( MenuItem item )

10
xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListActivity.java
View file

@ -20,13 +20,10 @@
package org.eehouse.android.xw4;
import android.app.ListActivity;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import org.eehouse.android.xw4.jni.CurGameInfo;
@ -81,13 +78,6 @@ public class GamesListActivity extends XWListActivity {
}
}
@Override
public void onBackPressed() {
if ( !m_dlgt.onBackPressed() ) {
super.onBackPressed();
}
}
public static void onGameDictDownload( Context context, Intent intent )
{
intent.setClass( context, GamesListActivity.class );

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java
View file

@ -429,7 +429,6 @@ public class GamesListDelegate extends ListDelegateBase
protected void onWindowFocusChanged( boolean hasFocus )
{
// super.onWindowFocusChanged( hasFocus );
if ( hasFocus ) {
updateField();
@ -604,6 +603,7 @@ public class GamesListDelegate extends ListDelegateBase
}
}
@Override
protected boolean onBackPressed() {
boolean handled = 0 < m_selGames.size() || 0 < m_selGroupIDs.size();
if ( handled ) {

7
xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyListActivity.java
View file

@ -39,13 +39,6 @@ public class StudyListActivity extends XWListActivity {
super.onCreate( savedInstanceState, m_dlgt );
}
@Override
public void onBackPressed() {
if ( !m_dlgt.backPressed() ) {
super.onBackPressed();
}
}
public static void launchOrAlert( Context context, int lang,
DlgDelegate.HasDlgDelegate dlg )
{

3
xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyListDelegate.java
View file

@ -82,7 +82,8 @@ public class StudyListDelegate extends ListDelegateBase
initOrFinish( getIntent() );
}
protected boolean backPressed()
@Override
protected boolean onBackPressed()
{
boolean handled = 0 < m_checkeds.size();
if ( handled ) {

7
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java
View file

@ -72,6 +72,13 @@ public class XWActivity extends Activity {
super.onDestroy();
}
@Override
public void onBackPressed() {
if ( !m_dlgt.onBackPressed() ) {
super.onBackPressed();
}
}
@Override
public boolean onCreateOptionsMenu( Menu menu )
{

7
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListActivity.java
View file

@ -72,6 +72,13 @@ public class XWListActivity extends ListActivity {
super.onDestroy();
}
@Override
public void onBackPressed() {
if ( !m_dlgt.onBackPressed() ) {
super.onBackPressed();
}
}
@Override
public boolean onCreateOptionsMenu( Menu menu )
{

7
xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocActivity.java
View file

@ -41,13 +41,6 @@ public class LocActivity extends XWListActivity {
return m_dlgt.onCreateOptionsMenu( menu );
}
@Override
public void onBackPressed() {
if ( !m_dlgt.onBackPressed() ) {
super.onBackPressed();
}
}
@Override
public void onWindowFocusChanged( boolean hasFocus )
{

7
xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocItemEditActivity.java
View file

@ -38,11 +38,4 @@ public class LocItemEditActivity extends XWActivity {
super.onCreate( savedInstanceState, m_dlgt );
} // onCreate
// Belongs in superclass?
@Override
public void onBackPressed() {
if ( !m_dlgt.backPressed() ) {
super.onBackPressed();
}
}
}