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, 14 insertions, 0 deletions

diff --git a/src/com/android/gallery3d/data/LocalAlbum.java b/src/com/android/gallery3d/data/LocalAlbum.java
index 1030c84e0..117dbb6fa 100644
--- a/src/com/android/gallery3d/data/LocalAlbum.java
+++ b/src/com/android/gallery3d/data/LocalAlbum.java
@@ -20,6 +20,7 @@ import android.content.ContentResolver;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.net.Uri;
+import android.provider.MediaStore;
 import android.provider.MediaStore.Images;
 import android.provider.MediaStore.Images.ImageColumns;
 import android.provider.MediaStore.Video;
@@ -90,6 +91,19 @@ public class LocalAlbum extends MediaSet {
     }
 
     @Override
+    public Uri getContentUri() {
+        if (mIsImage) {
+            return MediaStore.Images.Media.EXTERNAL_CONTENT_URI.buildUpon()
+                    .appendQueryParameter(LocalSource.KEY_BUCKET_ID,
+                            String.valueOf(mBucketId)).build();
+        } else {
+            return MediaStore.Video.Media.EXTERNAL_CONTENT_URI.buildUpon()
+                    .appendQueryParameter(LocalSource.KEY_BUCKET_ID,
+                            String.valueOf(mBucketId)).build();
+        }
+    }
+
+    @Override
     public ArrayList<MediaItem> getMediaItem(int start, int count) {
         DataManager dataManager = mApplication.getDataManager();
         Uri uri = mBaseUri.buildUpon()