Merge "Refactor grid fragments in new gallery" into gb-ub-photos-bryce

3 files changed, 59 insertions, 55 deletions

diff --git a/res/layout/album_set.xml b/res/layout/album_set.xml
deleted file mode 100644
index 5e2e84868..000000000
--- a/res/layout/album_set.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <GridView
-        android:id="@id/android:list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:numColumns="auto_fit"
-        android:columnWidth="@dimen/album_set_item_width"
-        android:stretchMode="columnWidth"
-        android:drawSelectorOnTop="true"
-        android:background="#E5E5E5"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-        android:horizontalSpacing="6dp"
-        android:verticalSpacing="6dp" />
-
-    <TextView
-        android:id="@id/android:empty"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/empty_album" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/multigrid_content.xml b/res/layout/multigrid_content.xml
new file mode 100644
index 000000000..82f6519d5
--- /dev/null
+++ b/res/layout/multigrid_content.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* Copyright 2013, 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.
+*/
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    <LinearLayout android:id="@+id/progressContainer"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone"
+            android:gravity="center">
+
+        <ProgressBar style="?android:attr/progressBarStyleLarge"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        <TextView android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:text="@string/loading"
+                android:paddingTop="4dip"
+                android:singleLine="true" />
+
+    </LinearLayout>
+
+    <FrameLayout android:id="@+id/gridContainer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+        <GridView android:id="@android:id/list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:choiceMode="multipleChoiceModal"
+                android:numColumns="auto_fit"
+                android:stretchMode="columnWidth"
+                android:drawSelectorOnTop="true" />
+        <TextView android:id="@android:id/empty"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+    </FrameLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/photo_set.xml b/res/layout/photo_set.xml
deleted file mode 100644
index 3e3d99a04..000000000
--- a/res/layout/photo_set.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingLeft="4dip"
-    android:paddingRight="4dip">
-
-    <GridView
-        android:id="@id/android:list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:drawSelectorOnTop="true"
-        android:numColumns="auto_fit"
-        android:stretchMode="columnWidth"
-        android:columnWidth="200dip"
-        android:horizontalSpacing="1dip"
-        android:verticalSpacing="1dip" />
-
-    <TextView
-        android:id="@id/android:empty"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/empty_album" />
-
-</FrameLayout>
\ No newline at end of file