diff options
| author | Alan Viverette <alanv@google.com> | 2014-11-14 01:52:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-14 01:52:14 +0000 |
| commit | 0c242376867feb434088387bfcdc6b4abcf7d465 (patch) | |
| tree | 62414c6d412aa934fcd479509bf4b718274ff10e /graphics | |
| parent | 0224d25db2f897ddfc29a722ad91d67dcf2500a9 (diff) | |
| parent | d03963ce364e9946f1bd603c2fcf07a49088af19 (diff) | |
| download | frameworks_base-0c242376867feb434088387bfcdc6b4abcf7d465.zip frameworks_base-0c242376867feb434088387bfcdc6b4abcf7d465.tar.gz frameworks_base-0c242376867feb434088387bfcdc6b4abcf7d465.tar.bz2 | |
Merge "Set current degrees when updating RotateDrawable from typed array" into lmp-mr1-dev
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/drawable/RotateDrawable.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/drawable/RotateDrawable.java b/graphics/java/android/graphics/drawable/RotateDrawable.java index 3304b33..1ee44fb 100644 --- a/graphics/java/android/graphics/drawable/RotateDrawable.java +++ b/graphics/java/android/graphics/drawable/RotateDrawable.java @@ -497,6 +497,7 @@ public class RotateDrawable extends Drawable implements Drawable.Callback { state.mFromDegrees = a.getFloat(R.styleable.RotateDrawable_fromDegrees, state.mFromDegrees); state.mToDegrees = a.getFloat(R.styleable.RotateDrawable_toDegrees, state.mToDegrees); + state.mCurrentDegrees = state.mFromDegrees; final Drawable dr = a.getDrawable(R.styleable.RotateDrawable_drawable); if (dr != null) { |