Fix some photo UI layout issues.

Change-Id: I04a68fe2e379db4a228d19cbe6444a10a8024ce0

1 files changed, 5 insertions, 4 deletions

diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java
index 1436390d3..fa9796f0e 100644
--- a/src/com/android/camera/ui/CameraControls.java
+++ b/src/com/android/camera/ui/CameraControls.java
@@ -414,10 +414,10 @@ public class CameraControls extends RotatableLayout {
     }
 
     private void layoutRemaingPhotos() {
-        int rl = mThumbnail.getLeft();
-        int rt = mThumbnail.getTop();
-        int rr = mThumbnail.getRight();
-        int rb = mThumbnail.getBottom();
+        int rl = mThumbnail.getLeft() + mBottomBar.getLeft();
+        int rt = mBottomBar.getTop();
+        int rr = rl + mThumbnail.getWidth();
+        int rb = rt + mThumbnail.getHeight();
         int w = mRemainingPhotos.getMeasuredWidth();
         int h = mRemainingPhotos.getMeasuredHeight();
         int m = getResources().getDimensionPixelSize(R.dimen.remaining_photos_margin);
@@ -450,6 +450,7 @@ public class CameraControls extends RotatableLayout {
             } else {
                 mRemainingPhotosText.setText(remaining + " ");
             }
+            mRemainingPhotos.setVisibility(View.VISIBLE);
         }
         mCurrentRemaining = remaining;
     }