summaryrefslogtreecommitdiff
path: root/Source/Android/src
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2013-11-16 01:48:17 -0500
committerLioncash <mathew1800@gmail.com>2013-11-16 01:48:17 -0500
commit777b5a109bc1d507957f4a10a3d94ae151f35e96 (patch)
treec440ed20601d6ac4b162f14fd414736b40b2b115 /Source/Android/src
parente8a4cc0f711b9b9c6f39bc281bc6a82ea36d2060 (diff)
[Android] Fix the handling of orientation changes for the Fragments related to the game list. Now screen orientation changes don't kick you back to the root view.
Diffstat (limited to 'Source/Android/src')
-rw-r--r--Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java40
1 files changed, 23 insertions, 17 deletions
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
index eba52036e5..bc0aeed446 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
@@ -9,7 +9,7 @@ package org.dolphinemu.dolphinemu.gamelist;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Fragment;
-import android.app.FragmentManager;
+import android.app.FragmentTransaction;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.Configuration;
@@ -23,6 +23,7 @@ import android.view.MenuItem;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ListView;
+
import org.dolphinemu.dolphinemu.AboutFragment;
import org.dolphinemu.dolphinemu.NativeLibrary;
import org.dolphinemu.dolphinemu.R;
@@ -103,10 +104,16 @@ public final class GameListActivity extends Activity
};
mDrawerLayout.setDrawerListener(mDrawerToggle);
- // Display the game list fragment.
- mCurFragment = new GameListFragment();
- FragmentManager fragmentManager = getFragmentManager();
- fragmentManager.beginTransaction().replace(R.id.content_frame, mCurFragment).commit();
+ // Display the game list fragment on activity creation,
+ // but only if no previous states have been saved.
+ if (savedInstanceState == null)
+ {
+ mCurFragment = new GameListFragment();
+ FragmentTransaction ft = getFragmentManager().beginTransaction();
+ ft.replace(R.id.content_frame, mCurFragment);
+ ft.commit();
+ }
+
// Create an alert telling them that their phone sucks
if (Build.CPU_ABI.contains("arm") && !NativeLibrary.SupportsNEON())
@@ -151,8 +158,9 @@ public final class GameListActivity extends Activity
mCurFragmentNum = 0;
mCurFragment = new GameListFragment();
- FragmentManager fragmentManager = getFragmentManager();
- fragmentManager.beginTransaction().replace(R.id.content_frame, mCurFragment).commit();
+ FragmentTransaction ft = getFragmentManager().beginTransaction();
+ ft.replace(R.id.content_frame, mCurFragment);
+ ft.commit();
invalidateOptionsMenu();
}
break;
@@ -161,8 +169,10 @@ public final class GameListActivity extends Activity
{
mCurFragmentNum = 1;
mCurFragment = new FolderBrowser();
- FragmentManager fragmentManager = getFragmentManager();
- fragmentManager.beginTransaction().replace(R.id.content_frame, mCurFragment).commit();
+ FragmentTransaction ft = getFragmentManager().beginTransaction();
+ ft.replace(R.id.content_frame, mCurFragment);
+ ft.addToBackStack(null);
+ ft.commit();
invalidateOptionsMenu();
}
break;
@@ -178,8 +188,10 @@ public final class GameListActivity extends Activity
{
mCurFragmentNum = 3;
mCurFragment = new AboutFragment();
- FragmentManager fragmentManager = getFragmentManager();
- fragmentManager.beginTransaction().replace(R.id.content_frame, mCurFragment).commit();
+ FragmentTransaction ft = getFragmentManager().beginTransaction();
+ ft.replace(R.id.content_frame, mCurFragment);
+ ft.addToBackStack(null);
+ ft.commit();
invalidateOptionsMenu();
}
break;
@@ -281,10 +293,4 @@ public final class GameListActivity extends Activity
return super.onOptionsItemSelected(item);
}
-
- @Override
- public void onBackPressed()
- {
- SwitchPage(0);
- }
}