summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app/Gallery.java
diff options
context:
space:
mode:
authorRay Chen <raychen@google.com>2011-10-04 15:19:44 +0800
committerRay Chen <raychen@google.com>2011-10-06 10:43:09 +0800
commitdbf4ba12afba115888493caa34937643257e2bb1 (patch)
treea8de0fc06225c6c0ff29302e6ea315d49d8032fa /src/com/android/gallery3d/app/Gallery.java
parent20cb268c47ce382859c6b3245e71a73e05a629d4 (diff)
downloadandroid_packages_apps_Gallery2-dbf4ba12afba115888493caa34937643257e2bb1.tar.gz
android_packages_apps_Gallery2-dbf4ba12afba115888493caa34937643257e2bb1.tar.bz2
android_packages_apps_Gallery2-dbf4ba12afba115888493caa34937643257e2bb1.zip
Fix 5250813 Use new standardized no account screen on first launch
This CL also fixes a bug in AlbumSetDataAdapter's ReloadTask, which causes empty screen after pause/resume. Change-Id: I7991d40a790384105ccb3021e1e51ba3e5ec8635
Diffstat (limited to 'src/com/android/gallery3d/app/Gallery.java')
-rw-r--r--src/com/android/gallery3d/app/Gallery.java20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/com/android/gallery3d/app/Gallery.java b/src/com/android/gallery3d/app/Gallery.java
index 4408dbaef..15534bc08 100644
--- a/src/com/android/gallery3d/app/Gallery.java
+++ b/src/com/android/gallery3d/app/Gallery.java
@@ -16,15 +16,6 @@
package com.android.gallery3d.app;
-import com.android.gallery3d.R;
-import com.android.gallery3d.common.Utils;
-import com.android.gallery3d.data.DataManager;
-import com.android.gallery3d.data.MediaItem;
-import com.android.gallery3d.data.MediaSet;
-import com.android.gallery3d.data.Path;
-import com.android.gallery3d.ui.GLRoot;
-import com.android.gallery3d.util.GalleryUtils;
-
import android.content.ContentResolver;
import android.content.Intent;
import android.net.Uri;
@@ -34,6 +25,16 @@ import android.view.MenuItem;
import android.view.Window;
import android.widget.Toast;
+import com.android.gallery3d.R;
+import com.android.gallery3d.common.Utils;
+import com.android.gallery3d.data.DataManager;
+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.ui.GLRoot;
+import com.android.gallery3d.util.GalleryUtils;
+
public final class Gallery extends AbstractGalleryActivity {
public static final String EXTRA_SLIDESHOW = "slideshow";
public static final String EXTRA_CROP = "crop";
@@ -90,6 +91,7 @@ public final class Gallery extends AbstractGalleryActivity {
}
public void startDefaultPage() {
+ PicasaSource.showSignInReminder(this);
Bundle data = new Bundle();
data.putString(AlbumSetPage.KEY_MEDIA_PATH,
getDataManager().getTopSetPath(DataManager.INCLUDE_ALL));