Merge change 3805 into donut

* changes:
  Enable multiselect delete.

2 files changed, 29 insertions, 1 deletions

diff --git a/res/layout/delete_image.xml b/res/layout/delete_image.xml
new file mode 100644
index 0000000..d60b1bd
--- /dev/null
+++ b/res/layout/delete_image.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+    <ProgressBar android:id="@+id/delete_progress"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:max="10000"/>
+</LinearLayout>
diff --git a/res/layout/image_gallery_2.xml b/res/layout/image_gallery_2.xml
index b2a9365..d76d6d1 100644
--- a/res/layout/image_gallery_2.xml
+++ b/res/layout/image_gallery_2.xml
@@ -68,11 +68,13 @@
             android:paddingBottom="1dip"
             android:background="@android:drawable/bottom_bar">
 
-        <Button android:id="@+id/button_share"
+        <!--
+            <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"