summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TimePickerDelegate.java
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2013-10-01 11:21:31 -0700
committerFabrice Di Meglio <fdimeglio@google.com>2014-07-15 20:26:21 +0000
commitbd9152f6ee156ee473f05f6f05f238605996fca4 (patch)
tree57ccd34b9e185f0a2ecf2ad8e56933b3db65a808 /core/java/android/widget/TimePickerDelegate.java
parentd8176941eb6466ebe26816d79b37a808103fd81d (diff)
Update DatePicker widget and its related dialog
- the old DatePicker widget is still there for obvious layout compatibility reasons - add a new delegate implementation for having a new UI - use the new delegate only for the DatePickerDialog (which does not need to be the same) - added support for Theming and light/dark Themes - added support for RTL - added support for Accessibility - verified support for Keyboard - verified that CTS tests for DatePicker are passing (for both the legacy and the new widgets) Also added a new HapticFeedbackConstants.CALENDAR_DATE and its related code for enabling day selection vibration Change-Id: I256bd7c21edd8f3b910413ca15ce26d3a5ef7d9c
Diffstat (limited to 'core/java/android/widget/TimePickerDelegate.java')
-rw-r--r--core/java/android/widget/TimePickerDelegate.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/TimePickerDelegate.java b/core/java/android/widget/TimePickerDelegate.java
index bf3971cbbf4e..cd896673a65a 100644
--- a/core/java/android/widget/TimePickerDelegate.java
+++ b/core/java/android/widget/TimePickerDelegate.java
@@ -1389,8 +1389,8 @@ class TimePickerDelegate extends TimePicker.AbstractTimePickerDelegate implement
final Keyframe k2 = Keyframe.ofFloat(0.69f, increaseRatio);
final Keyframe k3 = Keyframe.ofFloat(1f, 1f);
- PropertyValuesHolder scaleX = PropertyValuesHolder.ofKeyframe("scaleX", k0, k1, k2, k3);
- PropertyValuesHolder scaleY = PropertyValuesHolder.ofKeyframe("scaleY", k0, k1, k2, k3);
+ PropertyValuesHolder scaleX = PropertyValuesHolder.ofKeyframe(View.SCALE_X, k0, k1, k2, k3);
+ PropertyValuesHolder scaleY = PropertyValuesHolder.ofKeyframe(View.SCALE_Y, k0, k1, k2, k3);
ObjectAnimator pulseAnimator =
ObjectAnimator.ofPropertyValuesHolder(labelToAnimate, scaleX, scaleY);
pulseAnimator.setDuration(PULSE_ANIMATOR_DURATION);