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

fix finish() so it pops stack in fragment case

Browse source
This commit is contained in:
Eric House 2016-03-12 15:32:53 -08:00
parent 31d01e4ef0
commit 8981765897
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -223,8 +223,12 @@ public class DelegateBase implements DlgClickNotify,
protected void finish() protected void finish()
{ {
if ( m_activity instanceof FragActivity ) {
((FragActivity)m_activity).finishFragment();
} else {
m_activity.finish(); m_activity.finish();
} }
}
protected String getString( int resID, Object... params ) protected String getString( int resID, Object... params )
{ {

5
xwords4/android/XWords4/src/org/eehouse/android/xw4/FragActivity.java
View file

@ -124,6 +124,11 @@ public class FragActivity extends FragmentActivity
// // addFragment( dbf ); // // addFragment( dbf );
// } // }
protected void finishFragment()
{
popFragment( null );
}
protected void popFragment( Fragment frag ) protected void popFragment( Fragment frag )
{ {
getSupportFragmentManager().popBackStack(); getSupportFragmentManager().popBackStack();