summaryrefslogtreecommitdiff
path: root/Source/Android/res
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2013-08-29 17:20:46 -0400
committerLioncash <mathew1800@gmail.com>2013-08-29 17:21:17 -0400
commitaeec2496262b111a13be280971a3d42bbf46cc88 (patch)
tree57dd68780587899d1c4fa6b4623591ba1f93a5e7 /Source/Android/res
parent2de2e774fedff1b757ff3f0c457a0d0d8b862922 (diff)
[Android] Decouple the emulation processes from the Main activity. Moved them into their own activity called EmulationActivity.
Diffstat (limited to 'Source/Android/res')
-rw-r--r--Source/Android/res/layout/emulation_view.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Android/res/layout/emulation_view.xml b/Source/Android/res/layout/emulation_view.xml
index 017e98602e..9dcdf11166 100644
--- a/Source/Android/res/layout/emulation_view.xml
+++ b/Source/Android/res/layout/emulation_view.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="match_parent">
@@ -11,4 +11,4 @@
android:focusable="false"
android:focusableInTouchMode="false"/>
-</RelativeLayout> \ No newline at end of file
+</merge> \ No newline at end of file