diff options
| author | Chung-yih Wang <cywang@google.com> | 2011-08-25 18:46:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-25 18:46:47 -0700 |
| commit | 7fa062ee44a5f8a2401bd4b7147c2ca363abb5dd (patch) | |
| tree | 1799991615b2edf9178a4d90656c3ccc265a13c6 | |
| parent | 6f6ea6ab6dad370d2cc378be91a2649ae44b2c94 (diff) | |
| parent | 6caaf12d9695d19e6a7168dbd4a0bc9dc81c3e0a (diff) | |
| download | LegacyCamera-7fa062ee44a5f8a2401bd4b7147c2ca363abb5dd.zip LegacyCamera-7fa062ee44a5f8a2401bd4b7147c2ca363abb5dd.tar.gz LegacyCamera-7fa062ee44a5f8a2401bd4b7147c2ca363abb5dd.tar.bz2 | |
Merge "Fix animation for open/close second-level control."
| -rw-r--r-- | res/anim/grow_fade_in_from_bottom.xml | 12 | ||||
| -rw-r--r-- | res/anim/shrink_fade_out_from_top.xml | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/res/anim/grow_fade_in_from_bottom.xml b/res/anim/grow_fade_in_from_bottom.xml index df5bdf4..e2ea9ff 100644 --- a/res/anim/grow_fade_in_from_bottom.xml +++ b/res/anim/grow_fade_in_from_bottom.xml @@ -13,14 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - -<set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false"> - <scale android:interpolator="@android:interpolator/decelerate_quint" - android:fromXScale="1.0" android:toXScale="1.0" - android:fromYScale="0.2" android:toYScale="1.0" - android:pivotX="100%" android:pivotY="100%" - android:duration="300" /> - <alpha android:interpolator="@android:interpolator/decelerate_cubic" - android:fromAlpha="0.5" android:toAlpha="1.0" - android:duration="300" /> +<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator"> + <translate android:fromYDelta="100%p" android:toYDelta="0" android:duration="300" /> </set> diff --git a/res/anim/shrink_fade_out_from_top.xml b/res/anim/shrink_fade_out_from_top.xml index 4df151c..4d31904 100644 --- a/res/anim/shrink_fade_out_from_top.xml +++ b/res/anim/shrink_fade_out_from_top.xml @@ -13,14 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - -<set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false"> - <scale android:interpolator="@android:interpolator/decelerate_quint" - android:fromXScale="1.0" android:toXScale="1.0" - android:fromYScale="1.0" android:toYScale="0.2" - android:pivotX="100%" android:pivotY="100%" - android:duration="300" /> - <alpha android:interpolator="@android:interpolator/decelerate_cubic" - android:fromAlpha="1.0" android:toAlpha="0.0" - android:duration="300" /> +<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator"> + <translate android:fromYDelta="0" android:toYDelta="100%p" android:duration="300" /> </set> |