summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-01-26 22:57:54 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-26 22:57:54 -0800
commit009cc2956418d009547c9c980659ab0696755700 (patch)
tree340ddfc44dbc132105a02f3c1208ccd257b6bf4b /res
parentb7ac5f37ab0b68799fb2ab6af9482640542f93a8 (diff)
parent1f32188ea55267719fb33e1f444157cc029e23cf (diff)
downloadandroid_packages_apps_Trebuchet-009cc2956418d009547c9c980659ab0696755700.tar.gz
android_packages_apps_Trebuchet-009cc2956418d009547c9c980659ab0696755700.tar.bz2
android_packages_apps_Trebuchet-009cc2956418d009547c9c980659ab0696755700.zip
am 1f32188e: am 27b3721b: Merge "Using newer object animators for click feedback animation. (3384873)" into honeycomb
* commit '1f32188ea55267719fb33e1f444157cc029e23cf': Using newer object animators for click feedback animation. (3384873)
Diffstat (limited to 'res')
-rw-r--r--res/anim/paged_view_click_feedback.xml13
1 files changed, 7 insertions, 6 deletions
diff --git a/res/anim/paged_view_click_feedback.xml b/res/anim/paged_view_click_feedback.xml
index d1e6e2360..eb7ecef15 100644
--- a/res/anim/paged_view_click_feedback.xml
+++ b/res/anim/paged_view_click_feedback.xml
@@ -14,10 +14,11 @@
limitations under the License.
-->
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
- android:fromAlpha="1.0"
- android:toAlpha="0.5"
- android:duration="75"
- android:fillAfter="true"
+<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+ android:valueFrom="1.0"
+ android:valueTo="0.5"
+ android:valueType="floatType"
+ android:duration="100"
+ android:propertyName="alpha"
android:repeatCount="1"
- android:repeatMode="reverse" />
+ android:repeatMode="reverse"/>