diff options
| author | ztenghui <ztenghui@google.com> | 2014-09-23 19:45:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-23 19:45:28 +0000 |
| commit | 60f27e65710c73d80ba86016806e60e72df08b33 (patch) | |
| tree | 62fcfaca66eff9febf38186e6282f33a13b35804 /graphics | |
| parent | 4eb629048e60d449635bdd08ab947268c47b2da6 (diff) | |
| parent | 35603d70263fb204dee66b1504dc3fc69a1909f0 (diff) | |
| download | frameworks_base-60f27e65710c73d80ba86016806e60e72df08b33.zip frameworks_base-60f27e65710c73d80ba86016806e60e72df08b33.tar.gz frameworks_base-60f27e65710c73d80ba86016806e60e72df08b33.tar.bz2 | |
am aa60232b: am 8518c090: Merge "Fix animation on the some properties" into lmp-dev
* commit 'aa60232b96ace3ab176611c170e950a7b6db5481':
Fix animation on the some properties
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/drawable/VectorDrawable.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java index ace5eab..bbb0b50 100644 --- a/graphics/java/android/graphics/drawable/VectorDrawable.java +++ b/graphics/java/android/graphics/drawable/VectorDrawable.java @@ -1456,12 +1456,12 @@ public class VectorDrawable extends Drawable { /* Setters and Getters, used by animator from AnimatedVectorDrawable. */ @SuppressWarnings("unused") - int getStroke() { + int getStrokeColor() { return mStrokeColor; } @SuppressWarnings("unused") - void setStroke(int strokeColor) { + void setStrokeColor(int strokeColor) { mStrokeColor = strokeColor; } @@ -1476,32 +1476,32 @@ public class VectorDrawable extends Drawable { } @SuppressWarnings("unused") - float getstrokeAlpha() { + float getStrokeAlpha() { return mStrokeAlpha; } @SuppressWarnings("unused") - void setstrokeAlpha(float strokeAlpha) { + void setStrokeAlpha(float strokeAlpha) { mStrokeAlpha = strokeAlpha; } @SuppressWarnings("unused") - int getFill() { + int getFillColor() { return mFillColor; } @SuppressWarnings("unused") - void setFill(int fillColor) { + void setFillColor(int fillColor) { mFillColor = fillColor; } @SuppressWarnings("unused") - float getfillAlpha() { + float getFillAlpha() { return mFillAlpha; } @SuppressWarnings("unused") - void setfillAlpha(float fillAlpha) { + void setFillAlpha(float fillAlpha) { mFillAlpha = fillAlpha; } |