summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app/PhotoPage.java
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2012-10-23 20:52:26 -0700
committerBobby Georgescu <georgescu@google.com>2012-10-24 09:21:43 -0700
commit30cea9fd7d02cffe4a15c58a61fa823fee29db42 (patch)
tree3e20fd89dfa9c098f0c491706e2e20e7cfacf4dd /src/com/android/gallery3d/app/PhotoPage.java
parentb89ad7cf365087de7ca11166bcfbfecbe4584b98 (diff)
downloadandroid_packages_apps_Snap-30cea9fd7d02cffe4a15c58a61fa823fee29db42.tar.gz
android_packages_apps_Snap-30cea9fd7d02cffe4a15c58a61fa823fee29db42.tar.bz2
android_packages_apps_Snap-30cea9fd7d02cffe4a15c58a61fa823fee29db42.zip
Do not show bottom controls when undo bar is visible
Bug: 7403458 Change-Id: I1e789ebd7f08256a1ccbdb2ac9f2f9f97d0859c6
Diffstat (limited to 'src/com/android/gallery3d/app/PhotoPage.java')
-rw-r--r--src/com/android/gallery3d/app/PhotoPage.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index b24f080f0..2522188cf 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -598,7 +598,7 @@ public class PhotoPage extends ActivityState implements
@Override
public boolean canDisplayBottomControls() {
- return mIsActive;
+ return mIsActive && !mPhotoView.canUndo();
}
@Override
@@ -1528,4 +1528,9 @@ public class PhotoPage extends ActivityState implements
}
}
}
+
+ @Override
+ public void onUndoBarVisibilityChanged(boolean visible) {
+ refreshBottomControlsWhenReady();
+ }
}