From 25a08fc5ccebb8abac086416871ce27e39f10165 Mon Sep 17 00:00:00 2001 From: Mike Harris Date: Sat, 7 Oct 2017 22:14:37 -0700 Subject: [PATCH] Only postpone transistions on Activity creation. This is causing bugs (no UI is rendered) when the Activity is rotated. --- .../dolphinemu/activities/EmulationActivity.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 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 8102b30e8c..d28e78a8f7 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 @@ -220,11 +220,6 @@ public final class EmulationActivity extends AppCompatActivity Java_GCAdapter.manager = (UsbManager) getSystemService(Context.USB_SERVICE); Java_WiimoteAdapter.manager = (UsbManager) getSystemService(Context.USB_SERVICE); - - // Picasso will take a while to load these big-ass screenshots. So don't run - // the animation until we say so. - postponeEnterTransition(); - setContentView(R.layout.activity_emulation); mImageView = (ImageView) findViewById(R.id.image_screenshot); @@ -240,6 +235,10 @@ public final class EmulationActivity extends AppCompatActivity if (savedInstanceState == null) { + // Picasso will take a while to load these big-ass screenshots. So don't run + // the animation until we say so. + postponeEnterTransition(); + Picasso.with(this) .load(mScreenPath) .noFade()