summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-02-25 19:57:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-02-25 19:57:33 +0000
commita77cf8735432daddb233164f41103a0ff38408bb (patch)
tree7537a33c67ecc0b43ecd378862d177d700b94be0 /graphics
parent6924c4ef8db3ffd80b35f2b736b7ea9577148e9e (diff)
parent8a985d24ce9a38f40ed88fecbdcd0e75e3a68f44 (diff)
downloadframeworks_base-a77cf8735432daddb233164f41103a0ff38408bb.zip
frameworks_base-a77cf8735432daddb233164f41103a0ff38408bb.tar.gz
frameworks_base-a77cf8735432daddb233164f41103a0ff38408bb.tar.bz2
Merge "Tabs -> spaces in frameworks/base."
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/LayerRasterizer.java10
-rw-r--r--graphics/java/android/graphics/LinearGradient.java14
-rw-r--r--graphics/java/android/graphics/RadialGradient.java18
3 files changed, 21 insertions, 21 deletions
diff --git a/graphics/java/android/graphics/LayerRasterizer.java b/graphics/java/android/graphics/LayerRasterizer.java
index dc307c6..5b35608 100644
--- a/graphics/java/android/graphics/LayerRasterizer.java
+++ b/graphics/java/android/graphics/LayerRasterizer.java
@@ -21,11 +21,11 @@ public class LayerRasterizer extends Rasterizer {
native_instance = nativeConstructor();
}
- /** Add a new layer (above any previous layers) to the rasterizer.
- The layer will extract those fields that affect the mask from
- the specified paint, but will not retain a reference to the paint
- object itself, so it may be reused without danger of side-effects.
- */
+ /** Add a new layer (above any previous layers) to the rasterizer.
+ The layer will extract those fields that affect the mask from
+ the specified paint, but will not retain a reference to the paint
+ object itself, so it may be reused without danger of side-effects.
+ */
public void addLayer(Paint paint, float dx, float dy) {
nativeAddLayer(native_instance, paint.mNativePaint, dx, dy);
}
diff --git a/graphics/java/android/graphics/LinearGradient.java b/graphics/java/android/graphics/LinearGradient.java
index 9ad3e49..0eae67c 100644
--- a/graphics/java/android/graphics/LinearGradient.java
+++ b/graphics/java/android/graphics/LinearGradient.java
@@ -38,7 +38,7 @@ public class LinearGradient extends Shader {
private TileMode mTileMode;
- /** Create a shader that draws a linear gradient along a line.
+ /** Create a shader that draws a linear gradient along a line.
@param x0 The x-coordinate for the start of the gradient line
@param y0 The y-coordinate for the start of the gradient line
@param x1 The x-coordinate for the end of the gradient line
@@ -48,8 +48,8 @@ public class LinearGradient extends Shader {
each corresponding color in the colors array. If this is null,
the the colors are distributed evenly along the gradient line.
@param tile The Shader tiling mode
- */
- public LinearGradient(float x0, float y0, float x1, float y1, int colors[], float positions[],
+ */
+ public LinearGradient(float x0, float y0, float x1, float y1, int colors[], float positions[],
TileMode tile) {
if (colors.length < 2) {
throw new IllegalArgumentException("needs >= 2 number of colors");
@@ -70,7 +70,7 @@ public class LinearGradient extends Shader {
tile.nativeInt);
}
- /** Create a shader that draws a linear gradient along a line.
+ /** Create a shader that draws a linear gradient along a line.
@param x0 The x-coordinate for the start of the gradient line
@param y0 The y-coordinate for the start of the gradient line
@param x1 The x-coordinate for the end of the gradient line
@@ -78,8 +78,8 @@ public class LinearGradient extends Shader {
@param color0 The color at the start of the gradient line.
@param color1 The color at the end of the gradient line.
@param tile The Shader tiling mode
- */
- public LinearGradient(float x0, float y0, float x1, float y1, int color0, int color1,
+ */
+ public LinearGradient(float x0, float y0, float x1, float y1, int color0, int color1,
TileMode tile) {
mType = TYPE_COLOR_START_AND_COLOR_END;
mX0 = x0;
@@ -118,7 +118,7 @@ public class LinearGradient extends Shader {
private native long nativeCreate1(float x0, float y0, float x1, float y1,
int colors[], float positions[], int tileMode);
- private native long nativeCreate2(float x0, float y0, float x1, float y1,
+ private native long nativeCreate2(float x0, float y0, float x1, float y1,
int color0, int color1, int tileMode);
private native long nativePostCreate1(long native_shader, float x0, float y0, float x1, float y1,
int colors[], float positions[], int tileMode);
diff --git a/graphics/java/android/graphics/RadialGradient.java b/graphics/java/android/graphics/RadialGradient.java
index f10e5d6..c00c612 100644
--- a/graphics/java/android/graphics/RadialGradient.java
+++ b/graphics/java/android/graphics/RadialGradient.java
@@ -37,17 +37,17 @@ public class RadialGradient extends Shader {
private TileMode mTileMode;
- /** Create a shader that draws a radial gradient given the center and radius.
+ /** Create a shader that draws a radial gradient given the center and radius.
@param x The x-coordinate of the center of the radius
@param y The y-coordinate of the center of the radius
- @param radius Must be positive. The radius of the circle for this gradient
+ @param radius Must be positive. The radius of the circle for this gradient
@param colors The colors to be distributed between the center and edge of the circle
@param positions May be NULL. The relative position of
each corresponding color in the colors array. If this is NULL,
the the colors are distributed evenly between the center and edge of the circle.
@param tile The Shader tiling mode
- */
- public RadialGradient(float x, float y, float radius,
+ */
+ public RadialGradient(float x, float y, float radius,
int colors[], float positions[], TileMode tile) {
if (radius <= 0) {
throw new IllegalArgumentException("radius must be > 0");
@@ -70,15 +70,15 @@ public class RadialGradient extends Shader {
tile.nativeInt);
}
- /** Create a shader that draws a radial gradient given the center and radius.
+ /** Create a shader that draws a radial gradient given the center and radius.
@param x The x-coordinate of the center of the radius
@param y The y-coordinate of the center of the radius
- @param radius Must be positive. The radius of the circle for this gradient
+ @param radius Must be positive. The radius of the circle for this gradient
@param color0 The color at the center of the circle.
@param color1 The color at the edge of the circle.
@param tile The Shader tiling mode
- */
- public RadialGradient(float x, float y, float radius,
+ */
+ public RadialGradient(float x, float y, float radius,
int color0, int color1, TileMode tile) {
if (radius <= 0) {
throw new IllegalArgumentException("radius must be > 0");
@@ -119,7 +119,7 @@ public class RadialGradient extends Shader {
private static native long nativeCreate1(float x, float y, float radius,
int colors[], float positions[], int tileMode);
- private static native long nativeCreate2(float x, float y, float radius,
+ private static native long nativeCreate2(float x, float y, float radius,
int color0, int color1, int tileMode);
private static native long nativePostCreate1(long native_shader, float x, float y, float radius,