summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/CameraActivity.java6
-rw-r--r--src/com/android/camera/ui/CameraControls.java9
2 files changed, 8 insertions, 7 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 21fe651..ac3f2bc 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -744,7 +744,7 @@ public class CameraActivity extends Activity
if (!isSecureCamera()) {
mThumbnail.setVisibility(View.VISIBLE);
} else {
- mThumbnail.setVisibility(View.GONE);
+ mThumbnail.setVisibility(View.INVISIBLE);
}
}
}
@@ -757,7 +757,7 @@ public class CameraActivity extends Activity
if (!isSecureCamera()) {
mThumbnail.setVisibility(View.VISIBLE);
} else {
- mThumbnail.setVisibility(View.GONE);
+ mThumbnail.setVisibility(View.INVISIBLE);
}
}
}
@@ -811,7 +811,7 @@ public class CameraActivity extends Activity
if (mThumbnail != null) {
// Clear the image resource when the bitmap is invalid.
mThumbnail.setImageDrawable(null);
- mThumbnail.setVisibility(View.GONE);
+ mThumbnail.setVisibility(View.INVISIBLE);
}
} else {
updateThumbnail(bitmap);
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java
index 1436390..fa9796f 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;
}