diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2015-06-07 23:18:56 -0400 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2015-06-07 23:18:56 -0400 |
| commit | 51b440fbcfe8a8f9314c2c465ff2285dc197e81a (patch) | |
| tree | d29733ef87a738ef46312cd8f8c499bb1de00ba1 /Source/Android/app/src/main/res/layout | |
| parent | 49a0adb2e92c87a8d22797e0f9a3354ff5d19429 (diff) | |
| parent | 4faff3cf626b450852d1f3bf7802ed47520426fb (diff) | |
Merge pull request #2449 from sigmabeta/android-decouple-surfaceview
\Android: Decouple SurfaceView initialization and emulation start.
Diffstat (limited to 'Source/Android/app/src/main/res/layout')
| -rw-r--r-- | Source/Android/app/src/main/res/layout/fragment_emulation.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Android/app/src/main/res/layout/fragment_emulation.xml b/Source/Android/app/src/main/res/layout/fragment_emulation.xml index 6a936dae64..1db0d6b49f 100644 --- a/Source/Android/app/src/main/res/layout/fragment_emulation.xml +++ b/Source/Android/app/src/main/res/layout/fragment_emulation.xml @@ -5,7 +5,7 @@ tools:context="org.dolphinemu.dolphinemu.fragments.EmulationFragment"> <!-- This is what everything is rendered to during emulation --> - <org.dolphinemu.dolphinemu.emulation.NativeGLSurfaceView + <SurfaceView android:id="@+id/surface_emulation" android:layout_height="match_parent" android:layout_width="match_parent" |