diff options
| author | Chris Wren <cwren@android.com> | 2013-08-19 13:05:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-19 13:05:03 -0700 |
| commit | 3bde1dbb82c6232fa01611796aaa27c6bcbf290e (patch) | |
| tree | 31093de3024ba722e43c1bd6045842169fff25d4 | |
| parent | e02514713f7e3cd267c00ac5e6df472d72416265 (diff) | |
| parent | 9cc1455e9c71f797955dc18ede02b1f001289083 (diff) | |
| download | android_packages_screensavers_PhotoTable-3bde1dbb82c6232fa01611796aaa27c6bcbf290e.tar.gz android_packages_screensavers_PhotoTable-3bde1dbb82c6232fa01611796aaa27c6bcbf290e.tar.bz2 android_packages_screensavers_PhotoTable-3bde1dbb82c6232fa01611796aaa27c6bcbf290e.zip | |
am 9cc1455e: Use the server\'s name for the instant upload album.
* commit '9cc1455e9c71f797955dc18ede02b1f001289083':
Use the server's name for the instant upload album.
| -rw-r--r-- | res/values/strings.xml | 3 | ||||
| -rw-r--r-- | src/com/android/dreams/phototable/PicasaSource.java | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 1f64e10..392c6a9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -26,9 +26,6 @@ <!-- Name of the album that contains all g+ post photos, copy from Gallery. --> <string name="posts_album_name">Photos from Posts</string> - <!-- Name of the album that contains instant upload photos, copy from Gallery. --> - <string name="uploads_album_name">Instant Uploads</string> - <!-- Name for an album that doesn't seem to have any name at all. --> <string name="unknown_album_name">Unnamed Album</string> diff --git a/src/com/android/dreams/phototable/PicasaSource.java b/src/com/android/dreams/phototable/PicasaSource.java index 0272eb7..1dcd27d 100644 --- a/src/com/android/dreams/phototable/PicasaSource.java +++ b/src/com/android/dreams/phototable/PicasaSource.java @@ -67,7 +67,6 @@ public class PicasaSource extends CursorPhotoSource { private final int mMaxPostAblums; private final String mPostsAlbumName; - private final String mUploadsAlbumName; private final String mUnknownAlbumName; private final LinkedList<ImageData> mRecycleBin; private final ConnectivityManager mConnectivityManager; @@ -83,7 +82,6 @@ public class PicasaSource extends CursorPhotoSource { mLastPosition = INVALID; mMaxPostAblums = mResources.getInteger(R.integer.max_post_albums); mPostsAlbumName = mResources.getString(R.string.posts_album_name, "Posts"); - mUploadsAlbumName = mResources.getString(R.string.uploads_album_name, "Instant Uploads"); mUnknownAlbumName = mResources.getString(R.string.unknown_album_name, "Unknown"); mMaxRecycleSize = mResources.getInteger(R.integer.recycle_image_pool_size); mConnectivityManager = @@ -387,8 +385,6 @@ public class PicasaSource extends CursorPhotoSource { if (isPosts) { data.title = mPostsAlbumName; - } else if (isUpload) { - data.title = mUploadsAlbumName; } else if (titleIndex >= 0) { data.title = cursor.getString(titleIndex); } else { |