diff options
| author | Wei Huang <weih@google.com> | 2011-11-14 09:15:29 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-14 09:15:29 -0800 |
| commit | dae264eca3e139d73c1b45c511243ef94fc4d9d5 (patch) | |
| tree | 5f617083756b53f9b3cdce2c329d12754e5e5c98 /res/anim | |
| parent | c2b3d0008432c06ce43a4d93fa1fde1343a6dc65 (diff) | |
| parent | 006baced4746ddaf31fbd170bcb76abc5f1f8325 (diff) | |
| download | LegacyCamera-dae264eca3e139d73c1b45c511243ef94fc4d9d5.zip LegacyCamera-dae264eca3e139d73c1b45c511243ef94fc4d9d5.tar.gz LegacyCamera-dae264eca3e139d73c1b45c511243ef94fc4d9d5.tar.bz2 | |
Merge "Fix several UI bugs." into ics-mr1
Diffstat (limited to 'res/anim')
| -rw-r--r-- | res/anim/setting_popup_grow_fade_in.xml (renamed from res/anim/grow_fade_in_from_right.xml) | 2 | ||||
| -rw-r--r-- | res/anim/setting_popup_shrink_fade_out.xml (renamed from res/anim/shrink_fade_out_from_right.xml) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/res/anim/grow_fade_in_from_right.xml b/res/anim/setting_popup_grow_fade_in.xml index 3c7ff01..32f37c4 100644 --- a/res/anim/grow_fade_in_from_right.xml +++ b/res/anim/setting_popup_grow_fade_in.xml @@ -22,7 +22,7 @@ <scale android:interpolator="@android:interpolator/decelerate_quint" android:fromXScale="0.9" android:toXScale="1.0" android:fromYScale="0.9" android:toYScale="1.0" - android:pivotX="100%" android:pivotY="50%" + android:pivotX="50%" android:pivotY="100%" android:duration="300" /> <alpha android:interpolator="@android:interpolator/decelerate_cubic" android:fromAlpha="0.5" android:toAlpha="1.0" diff --git a/res/anim/shrink_fade_out_from_right.xml b/res/anim/setting_popup_shrink_fade_out.xml index dd6c43e..8b35b1b 100644 --- a/res/anim/shrink_fade_out_from_right.xml +++ b/res/anim/setting_popup_shrink_fade_out.xml @@ -22,7 +22,7 @@ <scale android:interpolator="@android:interpolator/decelerate_quint" android:fromXScale="1.0" android:toXScale="0.9" android:fromYScale="1.0" android:toYScale="0.9" - android:pivotX="100%" android:pivotY="50%" + android:pivotX="50%" android:pivotY="100%" android:duration="300" /> <alpha android:interpolator="@android:interpolator/decelerate_cubic" android:fromAlpha="1.0" android:toAlpha="0.0" |