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

fix finish() to not exit whole activity in dualpane mode

Browse source
This commit is contained in:
Eric House 2016-07-13 13:35:31 -07:00
parent a7013f3ede
commit 325304d83d
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -234,9 +234,16 @@ public class DelegateBase implements DlgClickNotify,
protected void finish()
{
if ( m_activity instanceof FragActivity ) {
((FragActivity)m_activity).finishFragment();
} else {
boolean handled = false;
if ( m_activity instanceof MainActivity ) {
MainActivity main = (MainActivity)m_activity;
if ( main.inDPMode() ) {
main.finishFragment();
handled = true;
}
}
if ( !handled ) {
m_activity.finish();
}
}

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

@ -180,6 +180,11 @@ public class MainActivity extends XWActivity
addFragmentImpl( fragment, extras, this );
}
protected void finishFragment()
{
getSupportFragmentManager().popBackStack();
}
//////////////////////////////////////////////////////////////////////
// FragmentManager.OnBackStackChangedListener
//////////////////////////////////////////////////////////////////////