Merge "Preliminary Album grid header in new gallery" into gb-ub-photos-bryce

7 files changed, 181 insertions, 30 deletions

diff --git a/res/drawable/white_text_bg_gradient.xml b/res/drawable/white_text_bg_gradient.xml
new file mode 100644
index 000000000..c355ce52f
--- /dev/null
+++ b/res/drawable/white_text_bg_gradient.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="#DD000000"
+        android:endColor="#00FFFFFF"
+        android:angle="90"
+     />
+</shape>
\ No newline at end of file
diff --git a/res/layout/album_content.xml b/res/layout/album_content.xml
new file mode 100644
index 000000000..97509fd3e
--- /dev/null
+++ b/res/layout/album_content.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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">
+
+        <com.android.photos.views.HeaderGridView 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/album_header.xml b/res/layout/album_header.xml
new file mode 100644
index 000000000..76c9a457f
--- /dev/null
+++ b/res/layout/album_header.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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="wrap_content" >
+
+    <ImageView
+        android:id="@+id/album_header_image"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:paddingLeft="15dip"
+        android:paddingBottom="10dip"
+        android:paddingTop="20dip"
+        android:background="@drawable/white_text_bg_gradient"
+        android:layout_gravity="bottom"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/album_header_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@android:color/white"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView
+            android:id="@+id/album_header_subtitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@android:color/white"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/multigrid_content.xml b/res/layout/multigrid_content.xml
index 82f6519d5..b1cb145a2 100644
--- a/res/layout/multigrid_content.xml
+++ b/res/layout/multigrid_content.xml
@@ -1,19 +1,17 @@
 <?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.
-*/
+<!-- Copyright (C) 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"
diff --git a/src/com/android/photos/AlbumActivity.java b/src/com/android/photos/AlbumActivity.java
index a93ab13da..c616b998b 100644
--- a/src/com/android/photos/AlbumActivity.java
+++ b/src/com/android/photos/AlbumActivity.java
@@ -22,7 +22,7 @@ import android.os.Bundle;
 public class AlbumActivity extends Activity implements MultiChoiceManager.Provider {
 
     public static final String KEY_ALBUM_URI = AlbumFragment.KEY_ALBUM_URI;
-    public static final String KEY_ALBUM_TITLE = "AlbumTitle";
+    public static final String KEY_ALBUM_TITLE = AlbumFragment.KEY_ALBUM_TITLE;
 
     private MultiChoiceManager mMultiChoiceManager;
 
diff --git a/src/com/android/photos/AlbumFragment.java b/src/com/android/photos/AlbumFragment.java
index e7164b616..406fd2a29 100644
--- a/src/com/android/photos/AlbumFragment.java
+++ b/src/com/android/photos/AlbumFragment.java
@@ -27,23 +27,30 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.GridView;
+import android.widget.ImageView;
+import android.widget.TextView;
 
+import com.android.gallery3d.R;
 import com.android.gallery3d.app.Gallery;
 import com.android.photos.adapters.PhotoThumbnailAdapter;
 import com.android.photos.data.PhotoSetLoader;
 import com.android.photos.shims.LoaderCompatShim;
 import com.android.photos.shims.MediaItemsLoader;
+import com.android.photos.views.HeaderGridView;
 
 import java.util.ArrayList;
 
 public class AlbumFragment extends MultiSelectGridFragment implements LoaderCallbacks<Cursor> {
 
     protected static final String KEY_ALBUM_URI = "AlbumUri";
+    protected static final String KEY_ALBUM_TITLE = "AlbumTitle";
     private static final int LOADER_ALBUM = 1;
 
     private LoaderCompatShim<Cursor> mLoaderCompatShim;
     private PhotoThumbnailAdapter mAdapter;
     private String mAlbumPath;
+    private String mAlbumTitle;
+    private View mHeaderView;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -53,15 +60,15 @@ public class AlbumFragment extends MultiSelectGridFragment implements LoaderCall
         Bundle args = getArguments();
         if (args != null) {
             mAlbumPath = args.getString(KEY_ALBUM_URI, null);
+            mAlbumTitle = args.getString(KEY_ALBUM_TITLE, null);
         }
     }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
-        View root = super.onCreateView(inflater, container, savedInstanceState);
         getLoaderManager().initLoader(LOADER_ALBUM, null, this);
-        return root;
+        return inflater.inflate(R.layout.album_content, container, false);
     }
 
     @Override
@@ -71,6 +78,27 @@ public class AlbumFragment extends MultiSelectGridFragment implements LoaderCall
         getGridView().setColumnWidth(MediaItemsLoader.getThumbnailSize());
     }
 
+    private void updateHeaderView() {
+        if (mHeaderView == null) {
+            mHeaderView = LayoutInflater.from(getActivity())
+                    .inflate(R.layout.album_header, getGridView(), false);
+            ((HeaderGridView) getGridView()).addHeaderView(mHeaderView, null, false);
+
+            // TODO remove this when the data model stabilizes
+            mHeaderView.setMinimumHeight(200);
+        }
+        ImageView iv = (ImageView) mHeaderView.findViewById(R.id.album_header_image);
+        TextView title = (TextView) mHeaderView.findViewById(R.id.album_header_title);
+        TextView subtitle = (TextView) mHeaderView.findViewById(R.id.album_header_subtitle);
+        title.setText(mAlbumTitle);
+        int count = mAdapter.getCount();
+        subtitle.setText(getActivity().getResources().getQuantityString(
+                R.plurals.number_of_photos, count, count));
+        if (count > 0) {
+            iv.setImageDrawable(mLoaderCompatShim.drawableForItem(mAdapter.getItem(0), null));
+        }
+    }
+
     @Override
     public void onGridItemClick(GridView g, View v, int position, long id) {
         if (mLoaderCompatShim == null) {
@@ -97,6 +125,7 @@ public class AlbumFragment extends MultiSelectGridFragment implements LoaderCall
     public void onLoadFinished(Loader<Cursor> loader,
             Cursor data) {
         mAdapter.swapCursor(data);
+        updateHeaderView();
         setAdapter(mAdapter);
     }
 
diff --git a/src/com/android/photos/MultiSelectGridFragment.java b/src/com/android/photos/MultiSelectGridFragment.java
index 123b55df0..dda9fe443 100644
--- a/src/com/android/photos/MultiSelectGridFragment.java
+++ b/src/com/android/photos/MultiSelectGridFragment.java
@@ -18,8 +18,6 @@ package com.android.photos;
 
 import android.app.Activity;
 import android.app.Fragment;
-import android.database.Cursor;
-import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.SparseBooleanArray;
@@ -34,14 +32,13 @@ import android.widget.TextView;
 
 import com.android.gallery3d.R;
 
-import java.util.ArrayList;
-
 public abstract class MultiSelectGridFragment extends Fragment
         implements MultiChoiceManager.Delegate, AdapterView.OnItemClickListener {
 
     final private Handler mHandler = new Handler();
 
     final private Runnable mRequestFocus = new Runnable() {
+        @Override
         public void run() {
             mGrid.focusableViewAvailable(mGrid);
         }
@@ -66,12 +63,6 @@ public abstract class MultiSelectGridFragment extends Fragment
      * {@link android.R.id#grid android.R.id.list} and can optionally have a
      * sibling text view id {@link android.R.id#empty android.R.id.empty} that
      * is to be shown when the grid is empty.
-     * <p>
-     * If you are overriding this method with your own custom content, consider
-     * including the standard layout R.layout.multigrid_content in your layout
-     * file, so that you continue to retain all of the standard behavior of
-     * MultiSelectGridFragment. In particular, this is currently the only way to
-     * have the built-in indeterminate progress state be shown.
      */
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -275,7 +266,7 @@ public abstract class MultiSelectGridFragment extends Fragment
      * Get the ListAdapter associated with this activity's GridView.
      */
     public ListAdapter getAdapter() {
-        return mAdapter;
+        return mGrid.getAdapter();
     }
 
     private void ensureGrid() {
@@ -330,7 +321,7 @@ public abstract class MultiSelectGridFragment extends Fragment
 
     @Override
     public Object getItemAtPosition(int position) {
-        return mAdapter.getItem(position);
+        return getAdapter().getItem(position);
     }
 
     @Override