summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Wren <cwren@android.com>2013-04-23 15:01:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-23 15:01:46 -0700
commitfd71443659f0dda8ba5c8d5cdef96d5965d0bab0 (patch)
tree4c3d357aec28988c5df3484093271e0f22ff705b
parentb1739315a31baf607c785e7b20c480b20e893ee9 (diff)
parentdd5f6f03990d50bbb353b2c4d77a90f8211b5a74 (diff)
downloadandroid_packages_screensavers_PhotoTable-fd71443659f0dda8ba5c8d5cdef96d5965d0bab0.tar.gz
android_packages_screensavers_PhotoTable-fd71443659f0dda8ba5c8d5cdef96d5965d0bab0.tar.bz2
android_packages_screensavers_PhotoTable-fd71443659f0dda8ba5c8d5cdef96d5965d0bab0.zip
am dd5f6f03: am ad757b21: catch InstantUploadAuto type.
* commit 'dd5f6f03990d50bbb353b2c4d77a90f8211b5a74': catch InstantUploadAuto type.
-rw-r--r--src/com/android/dreams/phototable/PicasaSource.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/dreams/phototable/PicasaSource.java b/src/com/android/dreams/phototable/PicasaSource.java
index eb8fd1f..0db98af 100644
--- a/src/com/android/dreams/phototable/PicasaSource.java
+++ b/src/com/android/dreams/phototable/PicasaSource.java
@@ -63,6 +63,7 @@ public class PicasaSource extends CursorPhotoSource {
private static final String PICASA_TYPE_IMAGE_VALUE = "image";
private static final String PICASA_POSTS_TYPE = "Buzz";
private static final String PICASA_UPLOAD_TYPE = "InstantUpload";
+ private static final String PICASA_UPLOADAUTO_TYPE = "InstantUploadAuto";
private final int mMaxPostAblums;
private final String mPostsAlbumName;
@@ -357,7 +358,8 @@ public class PicasaSource extends CursorPhotoSource {
String user = (userIndex >= 0 ? cursor.getString(userIndex) : "-1");
String type = (typeIndex >= 0 ? cursor.getString(typeIndex) : "none");
boolean isPosts = (typeIndex >= 0 && PICASA_POSTS_TYPE.equals(type));
- boolean isUpload = (typeIndex >= 0 && PICASA_UPLOAD_TYPE.equals(type));
+ boolean isUpload = (typeIndex >= 0 &&
+ (PICASA_UPLOAD_TYPE.equals(type) || PICASA_UPLOADAUTO_TYPE.equals(type)));
String account = accounts.get(user);
if (account == null) {