diff options
author | John Hoford <hoford@google.com> | 2013-02-26 21:54:30 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-26 21:54:31 +0000 |
commit | a79f94b38f82ce20cff5b4bbb45a110c96ddb9ab (patch) | |
tree | cefbb73b3c00635e7f71cb245fc9fd69277267cd | |
parent | 178b04f4cea6dcbe0f84f0f189e9280d4c0d1442 (diff) | |
parent | bdfaf6b49802ad9073adac89237076a1268bbdb1 (diff) | |
download | android_packages_apps_Snap-a79f94b38f82ce20cff5b4bbb45a110c96ddb9ab.tar.gz android_packages_apps_Snap-a79f94b38f82ce20cff5b4bbb45a110c96ddb9ab.tar.bz2 android_packages_apps_Snap-a79f94b38f82ce20cff5b4bbb45a110c96ddb9ab.zip |
Merge "add upoint" into gb-ub-photos-bryce
-rw-r--r-- | src/com/android/gallery3d/filtershow/PanelController.java | 4 | ||||
-rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java | 19 |
2 files changed, 22 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java index 5bda246da..d4712e873 100644 --- a/src/com/android/gallery3d/filtershow/PanelController.java +++ b/src/com/android/gallery3d/filtershow/PanelController.java @@ -447,6 +447,10 @@ public class PanelController implements OnClickListener { return MasterImage.getImage().getPreset(); } + public void setEffectName(String ename) { + mUtilityPanel.setEffectName(ename); + } + public void useFilterRepresentation(FilterRepresentation filterRepresentation) { if (filterRepresentation == null) { return; diff --git a/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java b/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java index b4ca8e1f1..a2a2e8568 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java +++ b/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java @@ -158,7 +158,24 @@ public class EclipseControl { } } - void paintPoint(Canvas canvas, float x, float y) { + public void paintGrayPoint(Canvas canvas, float x, float y) { + if (x == Float.NaN) { + return; + } + + Paint paint = new Paint(); + + paint.setStyle(Paint.Style.FILL); + paint.setColor(Color.BLUE); + int[] colors3 = new int[] { + Color.GRAY, Color.LTGRAY, 0x66000000, 0 }; + RadialGradient g = new RadialGradient(x, y, mCenterDotSize, colors3, new float[] { + 0, .3f, .31f, 1 }, Shader.TileMode.CLAMP); + paint.setShader(g); + canvas.drawCircle(x, y, mCenterDotSize, paint); + } + + public void paintPoint(Canvas canvas, float x, float y) { if (x == Float.NaN) { return; } |