Move the big disassemble button between the hex input and the key pad…

…; this should help when a toast from the hex pad overhangs one of the keypad buttons
penguin42 · Dec 26, 2012 · bff3675 · bff3675
1 parent b4f77de
commit bff3675
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 41 deletions.
diff --git a/gen/org/treblig/pocketdisassembler/R.java b/gen/org/treblig/pocketdisassembler/R.java
@@ -14,41 +14,41 @@ public static final class drawable {
         public static final int ic_launcher=0x7f020000;
     }
     public static final class id {
-        public static final int actionlayout=0x7f060023;
+        public static final int actionlayout=0x7f06000c;
         public static final int archhoriz=0x7f060002;
         public static final int archspinner=0x7f060003;
-        public static final int asmrow=0x7f060020;
+        public static final int asmrow=0x7f060022;
         public static final int entriestable=0x7f060007;
-        public static final int entryAsm=0x7f060022;
+        public static final int entryAsm=0x7f060024;
         public static final int entryHex=0x7f06000a;
-        public static final int godisassemble=0x7f060024;
-        public static final int hexkey0=0x7f06000d;
-        public static final int hexkey1=0x7f06000e;
-        public static final int hexkey2=0x7f06000f;
-        public static final int hexkey3=0x7f060010;
-        public static final int hexkey4=0x7f060011;
-        public static final int hexkey5=0x7f060012;
-        public static final int hexkey6=0x7f060013;
-        public static final int hexkey7=0x7f060014;
-        public static final int hexkey8=0x7f060017;
-        public static final int hexkey9=0x7f060018;
-        public static final int hexkeya=0x7f060019;
-        public static final int hexkeyb=0x7f06001a;
-        public static final int hexkeyc=0x7f06001b;
-        public static final int hexkeyd=0x7f06001c;
-        public static final int hexkeydel=0x7f060015;
-        public static final int hexkeye=0x7f06001d;
-        public static final int hexkeyf=0x7f06001e;
-        public static final int hexkeyspace=0x7f06001f;
+        public static final int godisassemble=0x7f06000d;
+        public static final int hexkey0=0x7f06000f;
+        public static final int hexkey1=0x7f060010;
+        public static final int hexkey2=0x7f060011;
+        public static final int hexkey3=0x7f060012;
+        public static final int hexkey4=0x7f060013;
+        public static final int hexkey5=0x7f060014;
+        public static final int hexkey6=0x7f060015;
+        public static final int hexkey7=0x7f060016;
+        public static final int hexkey8=0x7f060019;
+        public static final int hexkey9=0x7f06001a;
+        public static final int hexkeya=0x7f06001b;
+        public static final int hexkeyb=0x7f06001c;
+        public static final int hexkeyc=0x7f06001d;
+        public static final int hexkeyd=0x7f06001e;
+        public static final int hexkeydel=0x7f060017;
+        public static final int hexkeye=0x7f06001f;
+        public static final int hexkeyf=0x7f060020;
+        public static final int hexkeyspace=0x7f060021;
         public static final int hexrow=0x7f060008;
-        public static final int labelAsm=0x7f060021;
+        public static final int labelAsm=0x7f060023;
         public static final int labelHex=0x7f060009;
         public static final int optionsGrid=0x7f060006;
         public static final int optionslayout=0x7f060005;
         public static final int subarchspinner=0x7f060004;
         public static final int tableLayout1=0x7f06000b;
-        public static final int tableRow1=0x7f06000c;
-        public static final int tableRow2=0x7f060016;
+        public static final int tableRow1=0x7f06000e;
+        public static final int tableRow2=0x7f060018;
         public static final int tdclose=0x7f060028;
         public static final int tdlayout=0x7f060026;
         public static final int tdscroller=0x7f060025;

diff --git a/res/layout/main.xml b/res/layout/main.xml
@@ -7,7 +7,7 @@
     <LinearLayout
         android:id="@+id/toplevelbinutils"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical"
         android:scrollbars="vertical" >
 
@@ -94,6 +94,20 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" >
 
+                <LinearLayout
+                    android:id="@+id/actionlayout"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="true" >
+
+                    <Button
+                        android:id="@+id/godisassemble"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/disassemblelabel" />
+                </LinearLayout>
+
                 <TableRow
                     android:id="@+id/tableRow1"
                     android:layout_width="wrap_content"
@@ -248,21 +262,6 @@
                 </EditText>
             </TableRow>
         </TableLayout>
-
-        <LinearLayout
-            android:id="@+id/actionlayout"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:baselineAligned="true" >
-
-            <Button
-                android:id="@+id/godisassemble"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/disassemblelabel" />
-        </LinearLayout>
     </LinearLayout>
 
 </ScrollView>