Fix tutorial header

M66B · Aug 30, 2014 · 4dcaac1 · 4dcaac1
1 parent 58c9831
commit 4dcaac1
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 48 deletions.
diff --git a/res/layout/mainlist.xml b/res/layout/mainlist.xml
@@ -51,38 +51,31 @@
             android:id="@+id/svTutorialHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@id/llHeader"
             android:layout_alignTop="@id/llHeader"
             android:orientation="vertical"
             android:visibility="gone" >
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
-                android:background="?background_tutorial" >
+                android:background="?background_tutorial"
+                android:orientation="horizontal" >
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="horizontal"
-                    tools:ignore="UselessParent" >
-
-                    <TextView
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:text="@string/tutorial_mainheader"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                    <Button
-                        android:id="@+id/btnTutorialHeader"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="bottom"
-                        android:text="@android:string/ok" />
-                </LinearLayout>
-            </RelativeLayout>
+                <TextView
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/tutorial_mainheader"
+                    android:textAppearance="?android:attr/textAppearanceMedium" />
+
+                <Button
+                    android:id="@+id/btnTutorialHeader"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:text="@android:string/ok" />
+            </LinearLayout>
         </ScrollView>
     </RelativeLayout>
 

diff --git a/res/layout/restrictionlist.xml b/res/layout/restrictionlist.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -127,38 +126,31 @@
             android:id="@+id/svTutorialHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@id/llHeader"
             android:layout_alignTop="@id/llHeader"
             android:orientation="vertical"
             android:visibility="gone" >
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
-                android:background="?background_tutorial" >
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="horizontal"
-                    tools:ignore="UselessParent" >
+                android:background="?background_tutorial"
+                android:orientation="horizontal" >
 
-                    <TextView
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:text="@string/tutorial_detailsheader"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
+                <TextView
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/tutorial_mainheader"
+                    android:textAppearance="?android:attr/textAppearanceMedium" />
 
-                    <Button
-                        android:id="@+id/btnTutorialHeader"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="bottom"
-                        android:text="@android:string/ok" />
-                </LinearLayout>
-            </RelativeLayout>
+                <Button
+                    android:id="@+id/btnTutorialHeader"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:text="@android:string/ok" />
+            </LinearLayout>
         </ScrollView>
     </RelativeLayout>