summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/ui
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/ui
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/ui')
-rw-r--r--src/com/android/gallery3d/ui/PhotoView.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java
index f129961ff..0758656a1 100644
--- a/src/com/android/gallery3d/ui/PhotoView.java
+++ b/src/com/android/gallery3d/ui/PhotoView.java
@@ -125,6 +125,7 @@ public class PhotoView extends GLView {
public void onCommitDeleteImage();
public void onFilmModeChanged(boolean enabled);
public void onPictureCenter(boolean isCamera);
+ public void onUndoBarVisibilityChanged(boolean visible);
}
// The rules about orientation locking:
@@ -1359,6 +1360,7 @@ public class PhotoView extends GLView {
if(deleteLast) mUndoBarState |= UNDO_BAR_DELETE_LAST;
mUndoBar.animateVisibility(GLView.VISIBLE);
mHandler.sendEmptyMessageDelayed(MSG_UNDO_BAR_TIMEOUT, 3000);
+ if (mListener != null) mListener.onUndoBarVisibilityChanged(true);
}
private void hideUndoBar() {
@@ -1367,6 +1369,7 @@ public class PhotoView extends GLView {
mUndoBar.animateVisibility(GLView.INVISIBLE);
mUndoBarState = 0;
mUndoIndexHint = Integer.MAX_VALUE;
+ mListener.onUndoBarVisibilityChanged(false);
}
// Check if the one of the conditions for hiding the undo bar has been