From 0679e43efec8e9ca8dc690ea2a59bf7c1d045f7c Mon Sep 17 00:00:00 2001
From: sigmabeta <bastos.eder@gmail.com>
Date: Thu, 25 Jun 2015 21:43:00 -0400
Subject: [PATCH 1/3] Android: Show screenshot on EmulationActivity before game
 starts.

---
 .../activities/EmulationActivity.java         | 30 +++++++++++++++++++
 .../dolphinemu/adapters/GameAdapter.java      |  1 +
 .../main/res/layout/activity_emulation.xml    | 13 +++++++-
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
index d1e6f47273..ce3f9624c7 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
@@ -12,6 +12,10 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+
+import com.squareup.picasso.Picasso;
 
 import org.dolphinemu.dolphinemu.NativeLibrary;
 import org.dolphinemu.dolphinemu.R;
@@ -22,6 +26,8 @@ import java.util.List;
 public final class EmulationActivity extends AppCompatActivity
 {
 	private View mDecorView;
+	private ImageView mImageView;
+	private FrameLayout mFrameLayout;
 
 	private boolean mDeviceHasTouchScreen;
 	private boolean mSystemUiVisible;
@@ -79,9 +85,33 @@ public final class EmulationActivity extends AppCompatActivity
 
 		setContentView(R.layout.activity_emulation);
 
+		mImageView = (ImageView) findViewById(R.id.image_screenshot);
+		mFrameLayout = (FrameLayout) findViewById(R.id.frame_content);
+
 		Intent gameToEmulate = getIntent();
 		String path = gameToEmulate.getStringExtra("SelectedGame");
 		String title = gameToEmulate.getStringExtra("SelectedTitle");
+		String screenPath = gameToEmulate.getStringExtra("ScreenPath");
+
+		Picasso.with(this)
+				.load(screenPath)
+				.fit()
+				.noFade()
+				.into(mImageView);
+
+		mImageView.animate()
+				.setStartDelay(2000)
+				.setDuration(500)
+				.alpha(0.0f)
+				.withEndAction(new Runnable()
+				{
+					@Override
+					public void run()
+					{
+						mImageView.setVisibility(View.GONE);
+						mFrameLayout.setVisibility(View.VISIBLE);
+					}
+				});
 
 		setTitle(title);
 
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java
index a9a7be930e..8b279c52c2 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java
@@ -220,6 +220,7 @@ public final class GameAdapter extends RecyclerView.Adapter<GameViewHolder> impl
 
 		intent.putExtra("SelectedGame", holder.path);
 		intent.putExtra("SelectedTitle", holder.title);
+		intent.putExtra("ScreenPath", holder.screenshotPath);
 
 		view.getContext().startActivity(intent);
 	}
diff --git a/Source/Android/app/src/main/res/layout/activity_emulation.xml b/Source/Android/app/src/main/res/layout/activity_emulation.xml
index 63ea99ba83..5a644b260a 100644
--- a/Source/Android/app/src/main/res/layout/activity_emulation.xml
+++ b/Source/Android/app/src/main/res/layout/activity_emulation.xml
@@ -1,5 +1,16 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:layout_width="match_parent"
              android:layout_height="match_parent"
-             android:id="@+id/frame_content">
+    >
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/image_screenshot"/>
+
+    <FrameLayout
+        android:id="@+id/frame_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"/>
 </FrameLayout>
\ No newline at end of file

From 0fcf0e1d213892dd316bb57e5932c2e77fba691b Mon Sep 17 00:00:00 2001
From: sigmabeta <bastos.eder@gmail.com>
Date: Fri, 26 Jun 2015 08:32:51 -0400
Subject: [PATCH 2/3] Android: Show transition animation while game loads.

---
 .../activities/EmulationActivity.java         | 49 +++++++++++++++++--
 .../dolphinemu/adapters/GameAdapter.java      |  8 ++-
 .../main/res/layout/activity_emulation.xml    | 14 +++---
 .../app/src/main/res/layout/card_game.xml     |  2 +-
 .../res/transition/change_image_transform.xml |  4 ++
 .../app/src/main/res/values/styles.xml        | 26 +++++++++-
 6 files changed, 91 insertions(+), 12 deletions(-)
 create mode 100644 Source/Android/app/src/main/res/transition/change_image_transform.xml

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
index ce3f9624c7..44bfbb8272 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
@@ -12,9 +12,11 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewTreeObserver;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
+import com.squareup.picasso.Callback;
 import com.squareup.picasso.Picasso;
 
 import org.dolphinemu.dolphinemu.NativeLibrary;
@@ -51,6 +53,10 @@ public final class EmulationActivity extends AppCompatActivity
 	{
 		super.onCreate(savedInstanceState);
 
+		// Picasso will take a while to load these big-ass screenshots. So don't run
+		// the animation until we say so.
+		postponeEnterTransition();
+
 		mDeviceHasTouchScreen = getPackageManager().hasSystemFeature("android.hardware.touchscreen");
 
 		// Get a handle to the Window containing the UI.
@@ -95,21 +101,42 @@ public final class EmulationActivity extends AppCompatActivity
 
 		Picasso.with(this)
 				.load(screenPath)
-				.fit()
 				.noFade()
-				.into(mImageView);
+				.noPlaceholder()
+				.into(mImageView, new Callback()
+				{
+					@Override
+					public void onSuccess()
+					{
+						scheduleStartPostponedTransition(mImageView);
+					}
+
+					@Override
+					public void onError()
+					{
+						// Still have to do this, or else the app will crash.
+						scheduleStartPostponedTransition(mImageView);
+					}
+				});
 
 		mImageView.animate()
 				.setStartDelay(2000)
 				.setDuration(500)
 				.alpha(0.0f)
+				.withStartAction(new Runnable()
+				{
+					@Override
+					public void run()
+					{
+						mFrameLayout.setVisibility(View.VISIBLE);
+					}
+				})
 				.withEndAction(new Runnable()
 				{
 					@Override
 					public void run()
 					{
 						mImageView.setVisibility(View.GONE);
-						mFrameLayout.setVisibility(View.VISIBLE);
 					}
 				});
 
@@ -354,4 +381,20 @@ public final class EmulationActivity extends AppCompatActivity
 
 		hideSystemUiAfterDelay();
 	}
+
+
+	private void scheduleStartPostponedTransition(final View sharedElement)
+	{
+		sharedElement.getViewTreeObserver().addOnPreDrawListener(
+				new ViewTreeObserver.OnPreDrawListener()
+				{
+					@Override
+					public boolean onPreDraw()
+					{
+						sharedElement.getViewTreeObserver().removeOnPreDrawListener(this);
+						startPostponedEnterTransition();
+						return true;
+					}
+				});
+	}
 }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java
index 8b279c52c2..3cb832f91b 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java
@@ -1,6 +1,7 @@
 package org.dolphinemu.dolphinemu.adapters;
 
 import android.app.Activity;
+import android.app.ActivityOptions;
 import android.content.Intent;
 import android.database.Cursor;
 import android.database.DataSetObserver;
@@ -222,7 +223,12 @@ public final class GameAdapter extends RecyclerView.Adapter<GameViewHolder> impl
 		intent.putExtra("SelectedTitle", holder.title);
 		intent.putExtra("ScreenPath", holder.screenshotPath);
 
-		view.getContext().startActivity(intent);
+		ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(
+				(Activity) view.getContext(),
+				holder.imageScreenshot,
+				"image_game_screenshot");
+
+		view.getContext().startActivity(intent, options.toBundle());
 	}
 
 	/**
diff --git a/Source/Android/app/src/main/res/layout/activity_emulation.xml b/Source/Android/app/src/main/res/layout/activity_emulation.xml
index 5a644b260a..c686c6191e 100644
--- a/Source/Android/app/src/main/res/layout/activity_emulation.xml
+++ b/Source/Android/app/src/main/res/layout/activity_emulation.xml
@@ -3,14 +3,16 @@
              android:layout_height="match_parent"
     >
 
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/image_screenshot"/>
-
     <FrameLayout
         android:id="@+id/frame_content"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="gone"/>
+        android:visibility="invisible"/>
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/image_screenshot"
+        android:transitionName="image_game_screenshot"/>
+
 </FrameLayout>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/layout/card_game.xml b/Source/Android/app/src/main/res/layout/card_game.xml
index b18bc9e7ee..9b172b6871 100644
--- a/Source/Android/app/src/main/res/layout/card_game.xml
+++ b/Source/Android/app/src/main/res/layout/card_game.xml
@@ -20,7 +20,7 @@
             android:id="@+id/image_game_screen"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:transitionName="image_game_screen"
+            android:transitionName="image_game_screenshot"
             android:layout_weight="1"
             tools:src="@drawable/placeholder_screenshot"
             tools:scaleType="centerCrop"/>
diff --git a/Source/Android/app/src/main/res/transition/change_image_transform.xml b/Source/Android/app/src/main/res/transition/change_image_transform.xml
new file mode 100644
index 0000000000..3ee92bd7c4
--- /dev/null
+++ b/Source/Android/app/src/main/res/transition/change_image_transform.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<transitionSet>
+    <changeImageTransform/>
+</transitionSet>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/values/styles.xml b/Source/Android/app/src/main/res/values/styles.xml
index 98cf984807..dc81c173a7 100644
--- a/Source/Android/app/src/main/res/values/styles.xml
+++ b/Source/Android/app/src/main/res/values/styles.xml
@@ -7,6 +7,18 @@
         <item name="colorPrimary">@color/dolphin_blue</item>
         <!--   darker variant for the status bar and contextual app bars -->
         <item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
+
+        <!--enable window content transitions
+       <item name="android:windowContentTransitions">true</item>
+
+       &lt;!&ndash; specify enter and exit transitions &ndash;&gt;
+       <item name="android:windowEnterTransition">@android:transition/fade</item>
+       <item name="android:windowExitTransition">@android:transition/fade</item>
+
+       &lt;!&ndash; specify shared element transitions &ndash;&gt;
+       <item name="android:windowSharedElementEnterTransition">@transition/change_image_transform</item>
+       <item name="android:windowSharedElementExitTransition">@transition/change_image_transform</item>
+-->
     </style>
 
     <!-- Same as above, but use default action bar, and mandate margins. -->
@@ -66,6 +78,19 @@
         <item name="colorPrimary">@color/dolphin_blue</item>
         <item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
         <item name="android:windowTranslucentNavigation">true</item>
+
+        <!-- enable window content transitions -->
+        <item name="android:windowContentTransitions">true</item>
+
+        <!-- specify enter and exit transitions -->
+        <item name="android:windowEnterTransition">@android:transition/explode</item>
+        <item name="android:windowExitTransition">@android:transition/explode</item>
+
+        <!-- specify shared element transitions -->
+        <item name="android:windowSharedElementEnterTransition">@transition/change_image_transform
+        </item>
+        <item name="android:windowSharedElementExitTransition">@transition/change_image_transform
+        </item>
     </style>
 
     <!-- Inherit from the Base Dolphin Emulation Theme-->
@@ -81,7 +106,6 @@
         <item name="colorAccent">@color/dolphin_accent_wiiware</item>
     </style>
 
-
     <!-- Hax to make Tablayout render icons -->
     <style name="MyCustomTextAppearance" parent="TextAppearance.Design.Tab">
         <item name="textAllCaps">false</item>

From fd82f90fcea42c11435ce88a61cfe5dfd0d03f1a Mon Sep 17 00:00:00 2001
From: sigmabeta <sigmabeta@users.noreply.github.com>
Date: Fri, 26 Jun 2015 15:01:23 -0400
Subject: [PATCH 3/3] Android: Show transition animation when exiting game.

---
 .../dolphinemu/dolphinemu/NativeLibrary.java  |  2 +-
 .../activities/EmulationActivity.java         | 73 +++++++++++++++++--
 .../dolphinemu/activities/MainActivity.java   | 31 ++++++--
 .../dolphinemu/adapters/GameAdapter.java      | 14 ++--
 .../fragments/PlatformGamesFragment.java      | 16 +++-
 .../main/res/layout/activity_emulation.xml    |  3 +-
 .../app/src/main/res/values/styles.xml        | 33 +++------
 7 files changed, 124 insertions(+), 48 deletions(-)

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
index c9efb0c790..9fcdbe8cd1 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
@@ -277,7 +277,7 @@ public final class NativeLibrary
 	public static void endEmulationActivity()
 	{
 		Log.v("DolphinEmu", "Ending EmulationActivity.");
-		mEmulationActivity.finish();
+		mEmulationActivity.exitWithAnimation();
 	}
 
 	public static void setEmulationActivity(EmulationActivity emulationActivity)
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
index 44bfbb8272..6b27c08c4a 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
@@ -29,11 +29,14 @@ public final class EmulationActivity extends AppCompatActivity
 {
 	private View mDecorView;
 	private ImageView mImageView;
-	private FrameLayout mFrameLayout;
+	private FrameLayout mFrameEmulation;
 
 	private boolean mDeviceHasTouchScreen;
 	private boolean mSystemUiVisible;
 
+	// So that MainActivity knows which view to invalidate before the return animation.
+	private int mPosition;
+
 	/**
 	 * Handlers are a way to pass a message to an Activity telling it to do something
 	 * on the UI thread. This Handler responds to any message, even blank ones, by
@@ -47,6 +50,8 @@ public final class EmulationActivity extends AppCompatActivity
 			hideSystemUI();
 		}
 	};
+	private String mScreenPath;
+	private FrameLayout mFrameContent;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState)
@@ -92,15 +97,17 @@ public final class EmulationActivity extends AppCompatActivity
 		setContentView(R.layout.activity_emulation);
 
 		mImageView = (ImageView) findViewById(R.id.image_screenshot);
-		mFrameLayout = (FrameLayout) findViewById(R.id.frame_content);
+		mFrameContent = (FrameLayout) findViewById(R.id.frame_content);
+		mFrameEmulation = (FrameLayout) findViewById(R.id.frame_emulation_fragment);
 
 		Intent gameToEmulate = getIntent();
 		String path = gameToEmulate.getStringExtra("SelectedGame");
 		String title = gameToEmulate.getStringExtra("SelectedTitle");
-		String screenPath = gameToEmulate.getStringExtra("ScreenPath");
+		mScreenPath = gameToEmulate.getStringExtra("ScreenPath");
+		mPosition = gameToEmulate.getIntExtra("GridPosition", -1);
 
 		Picasso.with(this)
-				.load(screenPath)
+				.load(mScreenPath)
 				.noFade()
 				.noPlaceholder()
 				.into(mImageView, new Callback()
@@ -120,6 +127,7 @@ public final class EmulationActivity extends AppCompatActivity
 				});
 
 		mImageView.animate()
+				.withLayer()
 				.setStartDelay(2000)
 				.setDuration(500)
 				.alpha(0.0f)
@@ -128,7 +136,7 @@ public final class EmulationActivity extends AppCompatActivity
 					@Override
 					public void run()
 					{
-						mFrameLayout.setVisibility(View.VISIBLE);
+						mFrameEmulation.setVisibility(View.VISIBLE);
 					}
 				})
 				.withEndAction(new Runnable()
@@ -147,7 +155,7 @@ public final class EmulationActivity extends AppCompatActivity
 
 		// Add fragment to the activity - this triggers all its lifecycle callbacks.
 		getFragmentManager().beginTransaction()
-				.add(R.id.frame_content, emulationFragment, EmulationFragment.FRAGMENT_TAG)
+				.add(R.id.frame_emulation_fragment, emulationFragment, EmulationFragment.FRAGMENT_TAG)
 				.commit();
 	}
 
@@ -212,6 +220,59 @@ public final class EmulationActivity extends AppCompatActivity
 		}
 	}
 
+	public void exitWithAnimation()
+	{
+		runOnUiThread(new Runnable()
+		{
+			@Override
+			public void run()
+			{
+				Picasso.with(EmulationActivity.this)
+						.invalidate(mScreenPath);
+
+				Picasso.with(EmulationActivity.this)
+						.load(mScreenPath)
+						.noFade()
+						.noPlaceholder()
+						.into(mImageView, new Callback()
+						{
+							@Override
+							public void onSuccess()
+							{
+								showScreenshot();
+							}
+
+							@Override
+							public void onError()
+							{
+								finish();
+							}
+						});
+			}
+		});
+	}
+
+	private void showScreenshot()
+	{
+		mImageView.setVisibility(View.VISIBLE);
+		mImageView.animate()
+				.withLayer()
+				.setDuration(500)
+				.alpha(1.0f)
+				.withEndAction(afterShowingScreenshot);
+	}
+
+	private Runnable afterShowingScreenshot = new Runnable()
+	{
+		@Override
+		public void run()
+		{
+			mFrameContent.removeView(mFrameEmulation);
+			setResult(mPosition);
+			finishAfterTransition();
+		}
+	};
+
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu)
 	{
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/MainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/MainActivity.java
index 7812e6ead5..33cd0b0c15 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/MainActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/MainActivity.java
@@ -36,6 +36,7 @@ import org.dolphinemu.dolphinemu.services.AssetCopyService;
 public final class MainActivity extends AppCompatActivity implements LoaderManager.LoaderCallbacks<Cursor>
 {
 	private static final int REQUEST_ADD_DIRECTORY = 1;
+	public static final int REQUEST_EMULATE_GAME = 2;
 
 	/**
 	 * It is important to keep track of loader ID separately from platform ID (see Game.java)
@@ -115,15 +116,29 @@ public final class MainActivity extends AppCompatActivity implements LoaderManag
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent result)
 	{
-		// If the user picked a file, as opposed to just backing out.
-		if (resultCode == RESULT_OK)
+		switch (requestCode)
 		{
-			// Sanity check to make sure the Activity that just returned was the AddDirectoryActivity;
-			// other activities might use this callback in the future (don't forget to change Javadoc!)
-			if (requestCode == REQUEST_ADD_DIRECTORY)
-			{
-				refreshFragment();
-			}
+			case REQUEST_ADD_DIRECTORY:
+				// If the user picked a file, as opposed to just backing out.
+				if (resultCode == RESULT_OK)
+				{
+					// Sanity check to make sure the Activity that just returned was the AddDirectoryActivity;
+					// other activities might use this callback in the future (don't forget to change Javadoc!)
+					if (requestCode == REQUEST_ADD_DIRECTORY)
+					{
+						refreshFragment();
+					}
+				}
+				break;
+
+			case REQUEST_EMULATE_GAME:
+				// Invalidate Picasso image so that the new screenshot is animated in.
+				PlatformGamesFragment fragment = getPlatformFragment(mViewPager.getCurrentItem());
+
+				if (fragment != null)
+				{
+					fragment.refreshScreenshotAtPosition(resultCode);
+				}
 		}
 	}
 
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java
index 3cb832f91b..e74bd6f96d 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java
@@ -5,6 +5,7 @@ import android.app.ActivityOptions;
 import android.content.Intent;
 import android.database.Cursor;
 import android.database.DataSetObserver;
+import android.graphics.Bitmap;
 import android.graphics.Rect;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -16,6 +17,7 @@ import com.squareup.picasso.Picasso;
 
 import org.dolphinemu.dolphinemu.R;
 import org.dolphinemu.dolphinemu.activities.EmulationActivity;
+import org.dolphinemu.dolphinemu.activities.MainActivity;
 import org.dolphinemu.dolphinemu.dialogs.GameDetailsDialog;
 import org.dolphinemu.dolphinemu.model.GameDatabase;
 import org.dolphinemu.dolphinemu.viewholders.GameViewHolder;
@@ -81,14 +83,15 @@ public final class GameAdapter extends RecyclerView.Adapter<GameViewHolder> impl
 			if (mCursor.moveToPosition(position))
 			{
 				String screenPath = mCursor.getString(GameDatabase.GAME_COLUMN_SCREENSHOT_PATH);
-				Picasso.with(holder.imageScreenshot.getContext())
-						.invalidate(screenPath);
 
 				// Fill in the view contents.
 				Picasso.with(holder.imageScreenshot.getContext())
 						.load(screenPath)
 						.fit()
 						.centerCrop()
+						.noFade()
+						.noPlaceholder()
+						.config(Bitmap.Config.RGB_565)
 						.error(R.drawable.no_banner)
 						.into(holder.imageScreenshot);
 
@@ -113,8 +116,6 @@ public final class GameAdapter extends RecyclerView.Adapter<GameViewHolder> impl
 		{
 			Log.e("DolphinEmu", "Can't bind view; dataset is not valid.");
 		}
-
-
 	}
 
 	/**
@@ -222,13 +223,16 @@ public final class GameAdapter extends RecyclerView.Adapter<GameViewHolder> impl
 		intent.putExtra("SelectedGame", holder.path);
 		intent.putExtra("SelectedTitle", holder.title);
 		intent.putExtra("ScreenPath", holder.screenshotPath);
+		intent.putExtra("GridPosition", holder.getAdapterPosition());
 
 		ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(
 				(Activity) view.getContext(),
 				holder.imageScreenshot,
 				"image_game_screenshot");
 
-		view.getContext().startActivity(intent, options.toBundle());
+		((Activity) view.getContext()).startActivityForResult(intent,
+				MainActivity.REQUEST_EMULATE_GAME,
+				options.toBundle());
 	}
 
 	/**
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/PlatformGamesFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/PlatformGamesFragment.java
index 4957090ed3..c1d1b1c8e7 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/PlatformGamesFragment.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/PlatformGamesFragment.java
@@ -1,12 +1,12 @@
 package org.dolphinemu.dolphinemu.fragments;
 
-import android.app.Activity;
 import android.app.Fragment;
 import android.app.LoaderManager;
 import android.content.Loader;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v7.widget.DefaultItemAnimator;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -57,6 +57,15 @@ public class PlatformGamesFragment extends Fragment
 		RecyclerView.LayoutManager layoutManager = new GridLayoutManager(getActivity(),
 				getResources().getInteger(R.integer.game_grid_columns));
 		recyclerView.setLayoutManager(layoutManager);
+		recyclerView.setItemAnimator(new DefaultItemAnimator()
+		{
+			@Override
+			public boolean animateChange(RecyclerView.ViewHolder oldHolder, RecyclerView.ViewHolder newHolder, int fromX, int fromY, int toX, int toY)
+			{
+				dispatchChangeFinished(newHolder, false);
+				return true;
+			}
+		});
 
 		recyclerView.addItemDecoration(new GameAdapter.SpacesItemDecoration(8));
 
@@ -70,10 +79,9 @@ public class PlatformGamesFragment extends Fragment
 		return rootView;
 	}
 
-	@Override
-	public void onAttach(Activity activity)
+	public void refreshScreenshotAtPosition(int position)
 	{
-		super.onAttach(activity);
+		mAdapter.notifyItemChanged(position);
 	}
 
 	public void refresh()
diff --git a/Source/Android/app/src/main/res/layout/activity_emulation.xml b/Source/Android/app/src/main/res/layout/activity_emulation.xml
index c686c6191e..9e4e84e151 100644
--- a/Source/Android/app/src/main/res/layout/activity_emulation.xml
+++ b/Source/Android/app/src/main/res/layout/activity_emulation.xml
@@ -1,10 +1,11 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:layout_width="match_parent"
              android:layout_height="match_parent"
+             android:id="@+id/frame_content"
     >
 
     <FrameLayout
-        android:id="@+id/frame_content"
+        android:id="@+id/frame_emulation_fragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="invisible"/>
diff --git a/Source/Android/app/src/main/res/values/styles.xml b/Source/Android/app/src/main/res/values/styles.xml
index dc81c173a7..dcfe4a77b7 100644
--- a/Source/Android/app/src/main/res/values/styles.xml
+++ b/Source/Android/app/src/main/res/values/styles.xml
@@ -8,17 +8,10 @@
         <!--   darker variant for the status bar and contextual app bars -->
         <item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
 
-        <!--enable window content transitions
-       <item name="android:windowContentTransitions">true</item>
-
-       &lt;!&ndash; specify enter and exit transitions &ndash;&gt;
-       <item name="android:windowEnterTransition">@android:transition/fade</item>
-       <item name="android:windowExitTransition">@android:transition/fade</item>
-
-       &lt;!&ndash; specify shared element transitions &ndash;&gt;
-       <item name="android:windowSharedElementEnterTransition">@transition/change_image_transform</item>
-       <item name="android:windowSharedElementExitTransition">@transition/change_image_transform</item>
--->
+        <!--enable window content transitions-->
+        <item name="android:windowContentTransitions">true</item>
+        <item name="android:windowAllowEnterTransitionOverlap">true</item>
+        <item name="android:windowAllowReturnTransitionOverlap">true</item>
     </style>
 
     <!-- Same as above, but use default action bar, and mandate margins. -->
@@ -74,23 +67,17 @@
         <item name="colorAccent">@color/dolphin_accent_wiiware</item>
     </style>
 
-    <style name="DolphinEmulationBase" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="DolphinEmulationBase" parent="Theme.AppCompat">
         <item name="colorPrimary">@color/dolphin_blue</item>
         <item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
         <item name="android:windowTranslucentNavigation">true</item>
 
-        <!-- enable window content transitions -->
+        <item name="android:windowBackground">@android:color/black</item>
+
+        <!--enable window content transitions-->
         <item name="android:windowContentTransitions">true</item>
-
-        <!-- specify enter and exit transitions -->
-        <item name="android:windowEnterTransition">@android:transition/explode</item>
-        <item name="android:windowExitTransition">@android:transition/explode</item>
-
-        <!-- specify shared element transitions -->
-        <item name="android:windowSharedElementEnterTransition">@transition/change_image_transform
-        </item>
-        <item name="android:windowSharedElementExitTransition">@transition/change_image_transform
-        </item>
+        <item name="android:windowAllowEnterTransitionOverlap">true</item>
+        <item name="android:windowAllowReturnTransitionOverlap">true</item>
     </style>
 
     <!-- Inherit from the Base Dolphin Emulation Theme-->