Fix 3462852 [UI] When linking from Camera preview - App icon with 'Up' arrow should go to next level up.

Some changes in this CL:

1. ActivityState can decide whether to enable home button and show up arrow
2. ActivityState can handle home_up event on its own
3. Support getContentUri in LocalAlbum (Image/Video Roll) and LocalMergeAlbum (Camera Roll)
4. Gallery supports view action for AlbumPage (Camera Roll)

Change-Id: I85a75cdce9cbc2a877651fdec34a0180ed8e785c

1 files changed, 12 insertions, 1 deletions

diff --git a/src/com/android/gallery3d/data/LocalMergeAlbum.java b/src/com/android/gallery3d/data/LocalMergeAlbum.java
index bb796d53a..1e34e7817 100644
--- a/src/com/android/gallery3d/data/LocalMergeAlbum.java
+++ b/src/com/android/gallery3d/data/LocalMergeAlbum.java
@@ -16,6 +16,9 @@
 
 package com.android.gallery3d.data;
 
+import android.net.Uri;
+import android.provider.MediaStore;
+
 import java.lang.ref.SoftReference;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -38,16 +41,18 @@ public class LocalMergeAlbum extends MediaSet implements ContentListener {
     private String mName;
     private FetchCache[] mFetcher;
     private int mSupportedOperation;
+    private int mBucketId;
 
     // mIndex maps global position to the position of each underlying media sets.
     private TreeMap<Integer, int[]> mIndex = new TreeMap<Integer, int[]>();
 
     public LocalMergeAlbum(
-            Path path, Comparator<MediaItem> comparator, MediaSet[] sources) {
+            Path path, Comparator<MediaItem> comparator, MediaSet[] sources, int bucketId) {
         super(path, INVALID_DATA_VERSION);
         mComparator = comparator;
         mSources = sources;
         mName = sources.length == 0 ? "" : sources[0].getName();
+        mBucketId = bucketId;
         for (MediaSet set : mSources) {
             set.addContentListener(this);
         }
@@ -76,6 +81,12 @@ public class LocalMergeAlbum extends MediaSet implements ContentListener {
     }
 
     @Override
+    public Uri getContentUri() {
+        return MediaStore.Files.getContentUri("external").buildUpon().appendQueryParameter(
+                LocalSource.KEY_BUCKET_ID, String.valueOf(mBucketId)).build();
+    }
+
+    @Override
     public String getName() {
         return mName;
     }