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, 7 insertions, 1 deletions

diff --git a/src/com/android/gallery3d/data/LocalSource.java b/src/com/android/gallery3d/data/LocalSource.java
index 9bb561b14..19b2fec4f 100644
--- a/src/com/android/gallery3d/data/LocalSource.java
+++ b/src/com/android/gallery3d/data/LocalSource.java
@@ -75,6 +75,8 @@ class LocalSource extends MediaSource {
                 "external/images/media", LOCAL_IMAGE_ALBUM);
         mUriMatcher.addURI(MediaStore.AUTHORITY,
                 "external/video/media", LOCAL_VIDEO_ALBUM);
+        mUriMatcher.addURI(MediaStore.AUTHORITY,
+                "external/file", LOCAL_ALL_ALBUM);
     }
 
     @Override
@@ -98,7 +100,7 @@ class LocalSource extends MediaSource {
                         LocalAlbumSet.PATH_VIDEO.getChild(bucketId));
                 Comparator<MediaItem> comp = DataManager.sDateTakenComparator;
                 return new LocalMergeAlbum(
-                        path, comp, new MediaSet[] {imageSet, videoSet});
+                        path, comp, new MediaSet[] {imageSet, videoSet}, bucketId);
             }
             case LOCAL_IMAGE_ITEM:
                 return new LocalImage(path, mApplication, mMatcher.getIntVar(0));
@@ -122,6 +124,7 @@ class LocalSource extends MediaSource {
     }
 
     // The media type bit passed by the intent
+    private static final int MEDIA_TYPE_ALL = 0;
     private static final int MEDIA_TYPE_IMAGE = 1;
     private static final int MEDIA_TYPE_VIDEO = 4;
 
@@ -165,6 +168,9 @@ class LocalSource extends MediaSource {
                 case LOCAL_VIDEO_ALBUM: {
                     return getAlbumPath(uri, MEDIA_TYPE_VIDEO);
                 }
+                case LOCAL_ALL_ALBUM: {
+                    return getAlbumPath(uri, MEDIA_TYPE_ALL);
+                }
             }
         } catch (NumberFormatException e) {
             Log.w(TAG, "uri: " + uri.toString(), e);