am 385d27f9: (-s ours) am 9c33ce0b: (-s ours) Import translations. DO NOT MERGE

[android-x86/packages-apps-Gallery2.git] / res / layout / main.xml

diff --git a/res/layout/main.xml b/res/layout/main.xml
index 7dfe57a..08e5959 100644 (file)
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -4,14 +4,12 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-    <com.android.gallery3d.ui.GLRootView
-            android:id="@+id/gl_root_view"
+    <include layout="@layout/gl_root_group"/>
+    <FrameLayout android:id="@+id/header"
+            android:visibility="gone"
+            android:layout_alignParentTop="true"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentTop="true"/>
+            android:layout_height="wrap_content"/>
     <FrameLayout android:id="@+id/footer"
             android:visibility="gone"
             android:layout_alignParentBottom="true"