diff options
| author | Mike Harris <atarimike@gmail.com> | 2017-10-07 22:14:37 -0700 |
|---|---|---|
| committer | Mike Harris <atarimike@gmail.com> | 2017-10-15 16:44:56 -0700 |
| commit | 25a08fc5ccebb8abac086416871ce27e39f10165 (patch) | |
| tree | a210d783016be691a3712c8012bdecf70d45f807 /Source/Android/app/src/main/java | |
| parent | 80e1cc56b344a69aca0db07ebb2d9483d2b3d523 (diff) | |
Only postpone transistions on Activity creation.
This is causing bugs (no UI is rendered) when the Activity is rotated.
Diffstat (limited to 'Source/Android/app/src/main/java')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java | 9 |
1 files 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() |