diff options
Diffstat (limited to 'Source/Android/app/src/main/java')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java | 81 |
1 files changed, 43 insertions, 38 deletions
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 f03ff54024..93ba4757c5 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 @@ -138,50 +138,50 @@ public final class EmulationActivity extends AppCompatActivity mScreenPath = gameToEmulate.getStringExtra("ScreenPath"); mPosition = gameToEmulate.getIntExtra("GridPosition", -1); - Picasso.with(this) - .load(mScreenPath) - .noFade() - .noPlaceholder() - .into(mImageView, new Callback() - { - @Override - public void onSuccess() + if (savedInstanceState == null) + { + Picasso.with(this) + .load(mScreenPath) + .noFade() + .noPlaceholder() + .into(mImageView, new Callback() { - scheduleStartPostponedTransition(mImageView); - } + @Override + public void onSuccess() + { + scheduleStartPostponedTransition(mImageView); + } - @Override - public void onError() - { - // Still have to do this, or else the app will crash. - scheduleStartPostponedTransition(mImageView); - } - }); + @Override + public void onError() + { + // Still have to do this, or else the app will crash. + scheduleStartPostponedTransition(mImageView); + } + }); - mImageView.animate() - .withLayer() - .setStartDelay(2000) - .setDuration(500) - .alpha(0.0f) - .withStartAction(new Runnable() - { - @Override - public void run() + mImageView.animate() + .withLayer() + .setStartDelay(2000) + .setDuration(500) + .alpha(0.0f) + .withStartAction(new Runnable() { - mFrameEmulation.setVisibility(View.VISIBLE); - } - }) - .withEndAction(new Runnable() - { - @Override - public void run() + @Override + public void run() + { + mFrameEmulation.setVisibility(View.VISIBLE); + } + }) + .withEndAction(new Runnable() { - mImageView.setVisibility(View.GONE); - } - }); + @Override + public void run() + { + mImageView.setVisibility(View.GONE); + } + }); - if (savedInstanceState == null) - { // Instantiate an EmulationFragment. EmulationFragment emulationFragment = EmulationFragment.newInstance(path); @@ -190,6 +190,11 @@ public final class EmulationActivity extends AppCompatActivity .add(R.id.frame_emulation_fragment, emulationFragment, EmulationFragment.FRAGMENT_TAG) .commit(); } + else + { + mImageView.setVisibility(View.GONE); + mFrameEmulation.setVisibility(View.VISIBLE); + } if (mDeviceHasTouchScreen) { |