Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-08 05:24:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup old dialog code

Browse source 
remove some old stuff from pre-dialogfragment dialog handling. What's
left still needs auditing, as I'm not sure whether it can get called.
This commit is contained in:
Eric House 2017-04-07 00:33:45 -07:00
parent 50fe363da9
commit d9944252f6
2 changed files with 2 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
View file

@ -104,6 +104,8 @@ public class DelegateBase implements DlgClickNotify,
protected void onWindowFocusChanged( boolean hasFocus ) {} protected void onWindowFocusChanged( boolean hasFocus ) {}
protected boolean handleBackPressed() { return false; } protected boolean handleBackPressed() { return false; }
public void orientationChanged() {} public void orientationChanged() {}
protected Dialog onCreateDialog( int id ) { return null; }
protected void prepareDialog( DlgID dlgId, Dialog dialog ) {}
protected void requestWindowFeature( int feature ) {} protected void requestWindowFeature( int feature ) {}
@ -496,16 +498,6 @@ public class DelegateBase implements DlgClickNotify,
m_activity.removeDialog( id ); m_activity.removeDialog( id );
} }
protected Dialog onCreateDialog( int id )
{
return m_dlgDelegate.createDialog( id );
}
protected void prepareDialog( DlgID dlgId, Dialog dialog )
{
m_dlgDelegate.prepareDialog( dlgId, dialog );
}
protected AlertDialog.Builder makeAlertBuilder() protected AlertDialog.Builder makeAlertBuilder()
{ {
return LocUtils.makeAlertBuilder( m_activity ); return LocUtils.makeAlertBuilder( m_activity );

32
xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java
View file

@ -368,38 +368,6 @@ public class DlgDelegate {
} }
} }
public Dialog createDialog( int id )
{
Dialog dialog = null;
DlgID dlgID = DlgID.values()[id];
DlgState state = findForID( dlgID );
switch( dlgID ) {
case LOOKUP:
case DIALOG_OKONLY:
case DIALOG_NOTAGAIN:
case CONFIRM_THEN:
case INVITE_CHOICES_THEN:
case DIALOG_ENABLESMS:
Assert.assertFalse( BuildConfig.DEBUG );
break;
default:
Log.d( TAG, "not creating %s", dlgID.toString() );
break;
}
return dialog;
}
public void prepareDialog( DlgID dlgId, Dialog dialog )
{
switch( dlgId ) {
case INVITE_CHOICES_THEN:
case DIALOG_ENABLESMS:
Assert.assertFalse( BuildConfig.DEBUG );
// prepareInviteChoicesDialog( dialog );
break;
}
}
private void showOKOnlyDialogThen( String msg, Action action, private void showOKOnlyDialogThen( String msg, Action action,
Object[] params, int titleId ) Object[] params, int titleId )
{ {