diff options
| author | Romain Guy <romainguy@android.com> | 2010-07-29 14:32:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-29 14:32:29 -0700 |
| commit | 0f0b71600b658c2c1a5cac63cb402f9ea443cb30 (patch) | |
| tree | 7a50f309e6797af8bb84dbe63c3d58748ea01f06 /docs | |
| parent | 52075987c5726c95613f98571aac4c54e8319df4 (diff) | |
| parent | e53fe4a465a014788e3b93ca9f30f229481bc4e5 (diff) | |
| download | frameworks_base-0f0b71600b658c2c1a5cac63cb402f9ea443cb30.zip frameworks_base-0f0b71600b658c2c1a5cac63cb402f9ea443cb30.tar.gz frameworks_base-0f0b71600b658c2c1a5cac63cb402f9ea443cb30.tar.bz2 | |
am e53fe4a4: Merge "Fixed a documentation Bug (Issue 9236)"
Merge commit 'e53fe4a465a014788e3b93ca9f30f229481bc4e5' into gingerbread-plus-aosp
* commit 'e53fe4a465a014788e3b93ca9f30f229481bc4e5':
Fixed a documentation Bug (Issue 9236)
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/guide/topics/resources/animation-resource.jd | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/docs/html/guide/topics/resources/animation-resource.jd b/docs/html/guide/topics/resources/animation-resource.jd index e0ce051..972dd72 100644 --- a/docs/html/guide/topics/resources/animation-resource.jd +++ b/docs/html/guide/topics/resources/animation-resource.jd @@ -65,10 +65,10 @@ In XML: <code>@[<em>package</em>:]anim/<em>filename</em></code> android:pivotX="<em>float</em>" android:pivotY="<em>float</em>" /> <<a href="#translate-element">translate</a> - android:fromX="<em>float</em>" - android:toX="<em>float</em>" - android:fromY="<em>float</em>" - android:toY="<em>float</em>" /> + android:fromXDelta="<em>float</em>" + android:toXDelta="<em>float</em>" + android:fromYDelta="<em>float</em>" + android:toYDelta="<em>float</em>" /> <<a href="#rotate-element">rotate</a> android:fromDegrees="<em>float</em>" android:toDegrees="<em>float</em>" @@ -212,10 +212,10 @@ inherrited by this element).</p> android:shareInterpolator="false"> <scale android:interpolator="@android:anim/accelerate_decelerate_interpolator" - android:fromXScale="1.0" - android:toXScale="1.4" - android:fromYScale="1.0" - android:toYScale="0.6" + android:fromXScale="1.0" + android:toXScale="1.4" + android:fromYScale="1.0" + android:toYScale="0.6" android:pivotX="50%" android:pivotY="50%" android:fillAfter="false" @@ -224,18 +224,18 @@ inherrited by this element).</p> android:interpolator="@android:anim/accelerate_interpolator" android:startOffset="700"> <scale - android:fromXScale="1.4" + android:fromXScale="1.4" android:toXScale="0.0" android:fromYScale="0.6" - android:toYScale="0.0" - android:pivotX="50%" - android:pivotY="50%" + android:toYScale="0.0" + android:pivotX="50%" + android:pivotY="50%" android:duration="400" /> <rotate - android:fromDegrees="0" + android:fromDegrees="0" android:toDegrees="-45" - android:toYScale="0.0" - android:pivotX="50%" + android:toYScale="0.0" + android:pivotX="50%" android:pivotY="50%" android:duration="400" /> </set> |