summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/ui/CameraControls.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/ui/CameraControls.java')
-rw-r--r--src/com/android/camera/ui/CameraControls.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java
index f06c14d1b..c57c538f5 100644
--- a/src/com/android/camera/ui/CameraControls.java
+++ b/src/com/android/camera/ui/CameraControls.java
@@ -468,7 +468,9 @@ public class CameraControls extends RotatableLayout {
} else {
mRemainingPhotosText.setText(remaining + " ");
}
- mRemainingPhotos.setVisibility(View.VISIBLE);
+ if (mAnimationHelper.areControlsVisible()) {
+ mRemainingPhotos.setVisibility(View.VISIBLE);
+ }
}
mCurrentRemaining = remaining;
}
@@ -489,7 +491,6 @@ public class CameraControls extends RotatableLayout {
} else {
mBottomBar.setBackgroundResource(R.drawable.camera_controls_bg_translucent);
}
- mAnimationHelper.reset();
}
public void showRefocusToast(boolean show) {
@@ -636,6 +637,7 @@ public class CameraControls extends RotatableLayout {
}
public void reset() {
+ dump("reset");
if (mAnimator != null) {
mAnimator.cancel();
}