diff options
| author | Chet Haase <chet@google.com> | 2010-11-09 13:58:04 -0800 |
|---|---|---|
| committer | Chet Haase <chet@google.com> | 2010-11-23 14:05:42 -0800 |
| commit | 2970c499388b4dcd1232cd622a9b80b395eeb2b4 (patch) | |
| tree | c9e019b5c1ab43aea7e9e2becdcf8dde99a1a559 /graphics | |
| parent | f499eedd8bea27cae31464987d17d9810144c884 (diff) | |
| download | frameworks_base-2970c499388b4dcd1232cd622a9b80b395eeb2b4.zip frameworks_base-2970c499388b4dcd1232cd622a9b80b395eeb2b4.tar.gz frameworks_base-2970c499388b4dcd1232cd622a9b80b395eeb2b4.tar.bz2 | |
various fixes for animations and javadocs
Issues around threading of animations and AnimatorSet bugs are
fixed in this change. Unrelated fixes to javadocs in other
framework classes are also part of the change.
Change-Id: I35f7e03ffdec9143bc2eb155e8f9384798ad35b3
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/ComposeShader.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/java/android/graphics/ComposeShader.java b/graphics/java/android/graphics/ComposeShader.java index 8d5c913..241ab17 100644 --- a/graphics/java/android/graphics/ComposeShader.java +++ b/graphics/java/android/graphics/ComposeShader.java @@ -30,7 +30,7 @@ public class ComposeShader extends Shader { /** Create a new compose shader, given shaders A, B, and a combining mode. When the mode is applied, it will be given the result from shader A as its - "dst", and the result of from shader B as its "src". + "dst", and the result from shader B as its "src". @param shaderA The colors from this shader are seen as the "dst" by the mode @param shaderB The colors from this shader are seen as the "src" by the mode @param mode The mode that combines the colors from the two shaders. If mode @@ -53,7 +53,7 @@ public class ComposeShader extends Shader { /** Create a new compose shader, given shaders A, B, and a combining PorterDuff mode. When the mode is applied, it will be given the result from shader A as its - "dst", and the result of from shader B as its "src". + "dst", and the result from shader B as its "src". @param shaderA The colors from this shader are seen as the "dst" by the mode @param shaderB The colors from this shader are seen as the "src" by the mode @param mode The PorterDuff mode that combines the colors from the two shaders. |