summaryrefslogtreecommitdiffstats
path: root/src
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
commit6dc73063d683a05509467c915d306c2f68434bc0 (patch)
treefc4f9ad3e10be0150cdb799455f30dee02924f6b /src
parentd2ba8d7efb61b5c1a57b3ceb3e29da0dda484afc (diff)
parent726602b9f9b57dcfc213d2a7752ef111389da620 (diff)
downloadandroid_packages_apps_Snap-6dc73063d683a05509467c915d306c2f68434bc0.tar.gz
android_packages_apps_Snap-6dc73063d683a05509467c915d306c2f68434bc0.tar.bz2
android_packages_apps_Snap-6dc73063d683a05509467c915d306c2f68434bc0.zip
Merge "Only show FX button for photos" into gb-ub-photos-arches
Diffstat (limited to 'src')
-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();
}