summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOwen Lin <owenlin@android.com>2012-08-24 00:49:54 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-24 00:49:55 -0700
commit97fd6fa6b87350a609d717c56ade783135a81616 (patch)
tree22031f9b78837fd9d7a0ef14deb5f9f1bcb3bc08 /src
parent8a861a02136d15b45b9dbdc80e4f3bcc9de057c8 (diff)
parent9a93949a6ab6348b1a600496a7d52267620aab95 (diff)
downloadandroid_packages_apps_Gallery2-97fd6fa6b87350a609d717c56ade783135a81616.tar.gz
android_packages_apps_Gallery2-97fd6fa6b87350a609d717c56ade783135a81616.tar.bz2
android_packages_apps_Gallery2-97fd6fa6b87350a609d717c56ade783135a81616.zip
Merge "Use GalleryUtils.getSelectionModePrompt instead of duplicated code." into gb-ub-photos-arches
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/app/AlbumSetPage.java8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java
index 5f212345c..5d7d0850a 100644
--- a/src/com/android/gallery3d/app/AlbumSetPage.java
+++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -412,13 +412,7 @@ public class AlbumSetPage extends ActivityState implements
result = mActionBar.createActionMenu(menu, R.menu.pickup);
int typeBits = mData.getInt(
Gallery.KEY_TYPE_BITS, DataManager.INCLUDE_IMAGE);
- int id = R.string.select_image;
- if ((typeBits & DataManager.INCLUDE_VIDEO) != 0) {
- id = (typeBits & DataManager.INCLUDE_IMAGE) == 0
- ? R.string.select_video
- : R.string.select_item;
- }
- mActionBar.setTitle(id);
+ mActionBar.setTitle(GalleryUtils.getSelectionModePrompt(typeBits));
} else if (mGetAlbum) {
result = mActionBar.createActionMenu(menu, R.menu.pickup);
mActionBar.setTitle(R.string.select_album);