From 6a43ae56353b775e6e34d33cd5c4297db3a11f60 Mon Sep 17 00:00:00 2001
From: Chih-Chung Chang <chihchung@google.com>
Date: Thu, 2 Jul 2009 19:48:11 +0800
Subject: Fix 1956850: Muti-select is not usable for the last row of the images
 in gallery.

---
 res/layout/image_gallery_2.xml | 91 ++++++++++++++++++++++--------------------
 1 file changed, 48 insertions(+), 43 deletions(-)

(limited to 'res')

diff --git a/res/layout/image_gallery_2.xml b/res/layout/image_gallery_2.xml
index c833d41..497c890 100644
--- a/res/layout/image_gallery_2.xml
+++ b/res/layout/image_gallery_2.xml
@@ -18,14 +18,54 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent">
 
-    <view class="com.android.camera.GridViewSpecial"
-            android:id="@+id/grid"
-            android:focusable="true"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:listSelector="@drawable/grid_background"
-    />
-    
+    <LinearLayout android:orientation="vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent">
+
+        <view class="com.android.camera.GridViewSpecial"
+                android:id="@+id/grid"
+                android:focusable="true"
+                android:layout_width="fill_parent"
+                android:layout_height="0dip"
+                android:layout_weight="1"
+                android:listSelector="@drawable/grid_background"
+        />
+
+        <LinearLayout android:id="@+id/footer_organize"
+                android:orientation="horizontal"
+                android:visibility="gone"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:clickable="false"
+                android:paddingTop="5dip"
+                android:paddingLeft="4dip"
+                android:paddingRight="4dip"
+                android:paddingBottom="1dip"
+                android:background="@android:drawable/bottom_bar">
+
+            <!--
+                <Button android:id="@+id/button_share"
+                    android:layout_width="0dip"
+                    android:layout_height="fill_parent"
+                    android:layout_weight="1"
+                    android:text="@string/multiselect_share" />
+            -->
+
+            <Button android:id="@+id/button_delete"
+                    android:layout_width="0dip"
+                    android:layout_height="fill_parent"
+                    android:layout_weight="1"
+                    android:text="@string/multiselect_delete" />
+
+            <Button android:id="@+id/button_close"
+                    android:layout_width="0dip"
+                    android:layout_height="fill_parent"
+                    android:layout_weight="1"
+                    android:text="@string/multiselect_cancel" />
+        </LinearLayout>
+    </LinearLayout>
+
     <RelativeLayout android:id="@+id/no_images"
             android:visibility="gone"
             android:orientation="vertical"
@@ -54,40 +94,5 @@
                 android:textSize="18dip"
         />
     </RelativeLayout>
-
-    <LinearLayout android:id="@+id/footer_organize"
-            android:orientation="horizontal"
-            android:visibility="gone"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:clickable="false"
-            android:layout_alignParentBottom="true"
-            android:paddingTop="5dip"
-            android:paddingLeft="4dip"
-            android:paddingRight="4dip"
-            android:paddingBottom="1dip"
-            android:background="@android:drawable/bottom_bar">
-
-        <!--
-            <Button android:id="@+id/button_share"
-                android:layout_width="0dip"
-                android:layout_height="fill_parent"
-                android:layout_weight="1"
-                android:text="@string/multiselect_share" />
-        -->
-
-        <Button android:id="@+id/button_delete"
-                android:layout_width="0dip"
-                android:layout_height="fill_parent"
-                android:layout_weight="1"
-                android:text="@string/multiselect_delete" />
-
-        <Button android:id="@+id/button_close"
-                android:layout_width="0dip"
-                android:layout_height="fill_parent"
-                android:layout_weight="1"
-                android:text="@string/multiselect_cancel" />
-    </LinearLayout>
-
 </RelativeLayout>
 
-- 
cgit v1.1