diff options
author | John Reck <jreck@google.com> | 2013-01-29 01:35:38 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-01-29 01:35:38 +0000 |
commit | c58d88b469fd345df9bdbff0c147d91caa9959b5 (patch) | |
tree | b37a838e818f52876fffc1099d7915f2eb24271c /src/com/android/gallery3d/app | |
parent | 407d60623860a53780a53edac81f39193da44126 (diff) | |
parent | 76778f6aa46928263df4a39bd717aada9a5cde1a (diff) | |
download | android_packages_apps_Snap-c58d88b469fd345df9bdbff0c147d91caa9959b5.tar.gz android_packages_apps_Snap-c58d88b469fd345df9bdbff0c147d91caa9959b5.tar.bz2 android_packages_apps_Snap-c58d88b469fd345df9bdbff0c147d91caa9959b5.zip |
Merge "Launching gallery shows browse ui on canvas" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/gallery3d/app')
-rw-r--r-- | src/com/android/gallery3d/app/Gallery.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/Gallery.java b/src/com/android/gallery3d/app/Gallery.java index baef56b44..f847f2f39 100644 --- a/src/com/android/gallery3d/app/Gallery.java +++ b/src/com/android/gallery3d/app/Gallery.java @@ -37,6 +37,7 @@ import com.android.gallery3d.data.MediaItem; import com.android.gallery3d.data.MediaSet; import com.android.gallery3d.data.Path; import com.android.gallery3d.picasasource.PicasaSource; +import com.android.gallery3d.provider.CanvasProvider; import com.android.gallery3d.util.GalleryUtils; public final class Gallery extends AbstractGalleryActivity implements OnCancelListener { @@ -100,6 +101,10 @@ public final class Gallery extends AbstractGalleryActivity implements OnCancelLi } public void startDefaultPage() { + if (CanvasProvider.startBrowseActivity(this)) { + finish(); + return; + } PicasaSource.showSignInReminder(this); Bundle data = new Bundle(); data.putString(AlbumSetPage.KEY_MEDIA_PATH, |