diff options
| author | Andrew Sapperstein <asapperstein@google.com> | 2012-07-25 11:18:50 -0700 |
|---|---|---|
| committer | Andrew Sapperstein <asapperstein@google.com> | 2012-07-25 11:18:50 -0700 |
| commit | ebeb8b01ee3719f86d3ad96a0f0603032efbc1dc (patch) | |
| tree | 2c2aa4e4b12c0295f2a8d368291d806bd9c05b3f /photoviewer/src | |
| parent | 749602e643c76f981e1db26198876d103008b5e7 (diff) | |
| download | android_frameworks_ex-ebeb8b01ee3719f86d3ad96a0f0603032efbc1dc.tar.gz android_frameworks_ex-ebeb8b01ee3719f86d3ad96a0f0603032efbc1dc.tar.bz2 android_frameworks_ex-ebeb8b01ee3719f86d3ad96a0f0603032efbc1dc.zip | |
Finalized the photo viewer transitions.
Changed the black background to be on the
FrameLayout behind the view pager rather than
on the the photo view. Also deleted some dead code.
Change-Id: I19759d3f7e93c32b6c6aceda0c296610f90f20f7
Diffstat (limited to 'photoviewer/src')
| -rw-r--r-- | photoviewer/src/com/android/ex/photo/views/PhotoView.java | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/photoviewer/src/com/android/ex/photo/views/PhotoView.java b/photoviewer/src/com/android/ex/photo/views/PhotoView.java index 1de5ff4..647d168 100644 --- a/photoviewer/src/com/android/ex/photo/views/PhotoView.java +++ b/photoviewer/src/com/android/ex/photo/views/PhotoView.java @@ -80,10 +80,6 @@ public class PhotoView extends View implements GestureDetector.OnGestureListener /** Paint to highlight the cropped portion of the photo */ private static Paint sCropPaint; - // Colours - /** The colour of the header background */ - private static int sBackgroundColor; - /** The photo to display */ private BitmapDrawable mDrawable; /** The matrix used for drawing; this may be {@code null} */ @@ -516,9 +512,6 @@ public class PhotoView extends View implements GestureDetector.OnGestureListener matrix.postTranslate(-mCropRect.left, -mCropRect.top); matrix.postScale(scaleWidth, scaleHeight); - // Set the background to black - croppedCanvas.drawColor(sBackgroundColor); - // draw the photo if (mDrawable != null) { croppedCanvas.concat(matrix); @@ -558,8 +551,6 @@ public class PhotoView extends View implements GestureDetector.OnGestureListener @Override protected void onDraw(Canvas canvas) { super.onDraw(canvas); - // Set the background to black - canvas.drawColor(sBackgroundColor); // draw the photo if (mDrawable != null) { @@ -934,9 +925,6 @@ public class PhotoView extends View implements GestureDetector.OnGestureListener Resources resources = context.getApplicationContext().getResources(); - // Initialize colors - sBackgroundColor = resources.getColor(R.color.photo_background_color); - sCropSize = resources.getDimensionPixelSize(R.dimen.photo_crop_width); sCropDimPaint = new Paint(); |