summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2012-09-14 00:08:44 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-14 00:08:45 -0700
commit0b0283daab224412f9b3f7d04294ddea83d8f582 (patch)
tree865d200f50d664b9c48ad722c4b5dd9077bf0d5b
parente18ad87571a6a9f0e1943f9c527c8d908494256e (diff)
parent14ad4efd409887a0f4cd90e29818c8c3bd2ece8f (diff)
downloadandroid_packages_apps_Gallery2-0b0283daab224412f9b3f7d04294ddea83d8f582.tar.gz
android_packages_apps_Gallery2-0b0283daab224412f9b3f7d04294ddea83d8f582.tar.bz2
android_packages_apps_Gallery2-0b0283daab224412f9b3f7d04294ddea83d8f582.zip
Merge "Only show FX button for photos" into gb-ub-photos-arches
-rw-r--r--src/com/android/gallery3d/app/PhotoPage.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 980090898..62a80bab7 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -444,7 +444,8 @@ public class PhotoPage extends ActivityState implements
private void refreshEditButton() {
if (mEditButton == null) return;
- if(mShowBars) {
+ if (mShowBars && mCurrentPhoto != null
+ && mCurrentPhoto.getMediaType() == MediaObject.MEDIA_TYPE_IMAGE) {
mEditButton.setVisibility(View.VISIBLE);
} else {
mEditButton.setVisibility(View.GONE);
@@ -497,6 +498,7 @@ public class PhotoPage extends ActivityState implements
if (mCurrentPhoto == null) return;
updateMenuOperations();
updateTitle();
+ refreshEditButton();
if (mShowDetails) {
mDetailsHelper.reloadDetails();
}