diff options
author | Owen Lin <owenlin@android.com> | 2012-08-24 00:49:54 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-24 00:49:55 -0700 |
commit | 54b8926da0bdc30577641af1f2fc7b151ea6f3e5 (patch) | |
tree | fd9d1c78fe7a259fa74da39ef651c8bfd7cc49d7 /src/com | |
parent | ac46c7f5749141dfa91f7a1d8f923ef3bb7fd600 (diff) | |
parent | fe5f61fe12c8537caa4b82f316b99672d7737bd6 (diff) | |
download | android_packages_apps_Snap-54b8926da0bdc30577641af1f2fc7b151ea6f3e5.tar.gz android_packages_apps_Snap-54b8926da0bdc30577641af1f2fc7b151ea6f3e5.tar.bz2 android_packages_apps_Snap-54b8926da0bdc30577641af1f2fc7b151ea6f3e5.zip |
Merge "Use GalleryUtils.getSelectionModePrompt instead of duplicated code." into gb-ub-photos-arches
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/gallery3d/app/AlbumSetPage.java | 8 |
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); |