summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2012-10-26 00:53:22 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-26 00:53:22 -0700
commitea550290cf71d8f54cfd86163c463be436600a50 (patch)
tree8577bc7361b5cd656d438f3949b7ebe65f354fdf
parent8e0c2fd78fb35252db8f87fbfc883f769e568d99 (diff)
parenta4f31025a49ef4a8e1ebf8ab6d1e7134f37556d5 (diff)
downloadandroid_packages_apps_Snap-ea550290cf71d8f54cfd86163c463be436600a50.tar.gz
android_packages_apps_Snap-ea550290cf71d8f54cfd86163c463be436600a50.tar.bz2
android_packages_apps_Snap-ea550290cf71d8f54cfd86163c463be436600a50.zip
am 8d8cdf7f: Fix colors in rotate and mirror
* commit '8d8cdf7f67db69309fd740ca301fbeaadac8a9f0': Fix colors in rotate and mirror
-rw-r--r--src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java4
-rw-r--r--src/com/android/gallery3d/filtershow/imageshow/ImageShow.java4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java b/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
index 6bdc527be..42dd139bc 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
@@ -494,7 +494,7 @@ public abstract class ImageGeometry extends ImageSlave {
paint.setStyle(Style.STROKE);
paint.setStrokeWidth(2);
drawCropSafe(canvas, paint);
- paint.setARGB(128, 0, 0, 0);
+ paint.setColor(getDefaultBackgroundColor());
paint.setStyle(Paint.Style.FILL);
drawShadows(canvas, paint, unrotatedCropBounds());
}
@@ -614,7 +614,7 @@ public abstract class ImageGeometry extends ImageSlave {
canvas.drawBitmap(photo, m1, p);
canvas.restore();
- p.setARGB(255, 0, 0, 0);
+ p.setColor(getDefaultBackgroundColor());
p.setStyle(Paint.Style.FILL);
scaledCrop.offset(displayCenter[0] - scaledCrop.centerX(), displayCenter[1]
- scaledCrop.centerY());
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
index c113e5d92..0145c24dc 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java
@@ -125,6 +125,10 @@ public class ImageShow extends View implements OnGestureListener,
mBackgroundColor = value;
}
+ public int getDefaultBackgroundColor() {
+ return mBackgroundColor;
+ }
+
public static void setTextSize(int value) {
mTextSize = value;
}