diff options
| author | Danny Baumann <dannybaumann@web.de> | 2016-11-29 09:48:23 +0100 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2016-12-23 00:32:29 -0800 |
| commit | 1e7ddd0240e6d6e018bcc39d4c6cd1257388eee6 (patch) | |
| tree | 90e0a99d4edb163f14bfb333e1c1b3f3f444d25d /src | |
| parent | 5586581050bcb045d6463d97b3f6d11f62454639 (diff) | |
| download | android_packages_apps_Snap-1e7ddd0240e6d6e018bcc39d4c6cd1257388eee6.tar.gz android_packages_apps_Snap-1e7ddd0240e6d6e018bcc39d4c6cd1257388eee6.tar.bz2 android_packages_apps_Snap-1e7ddd0240e6d6e018bcc39d4c6cd1257388eee6.zip | |
Fix some photo UI layout issues.
Change-Id: I04a68fe2e379db4a228d19cbe6444a10a8024ce0
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 6 | ||||
| -rw-r--r-- | src/com/android/camera/ui/CameraControls.java | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 21fe6516e..ac3f2bc29 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 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; } |