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

fix dialog not having custom OK button by not ignoring the param passed in.

Browse source
This commit is contained in:
Eric House 2013-01-31 06:59:42 -08:00
parent 660efa6380
commit a18fb62b0f
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
View file

@ -375,7 +375,7 @@ public class DlgDelegate {
Dialog dialog = new AlertDialog.Builder( m_activity )
.setTitle( R.string.query_title )
.setMessage( state.m_msg )
.setPositiveButton( R.string.button_ok, lstnr )
.setPositiveButton( state.m_posButton, lstnr )
.setNegativeButton( R.string.button_cancel, lstnr )
.create();
@ -457,7 +457,7 @@ public class DlgDelegate {
{
int nDlgs = m_dlgStates.size();
Assert.assertNotNull( state );
Assert.assertTrue( state == m_dlgStates.get( state.m_id ) );
// Assert.assertTrue( state == m_dlgStates.get( state.m_id ) );
m_dlgStates.remove( state.m_id );
DbgUtils.logf( "dropState: active dialogs now %d from %d ",
m_dlgStates.size(), nDlgs );

4
xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgState.java
View file

@ -32,12 +32,12 @@ public class DlgState implements Parcelable {
public DlgState( int id, String msg, int cbckID )
{
this( id, msg, 0, cbckID, 0 );
this( id, msg, R.string.button_ok, cbckID, 0 );
}
public DlgState( int id, String msg, int cbckID, int prefsKey )
{
this( id, msg, 0, cbckID, prefsKey );
this( id, msg, R.string.button_ok, cbckID, prefsKey );
}
public DlgState( int id, String msg, int posButton,