diff options
| author | Doris Liu <tianliu@google.com> | 2015-04-18 00:14:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-18 00:14:38 +0000 |
| commit | b1b0aa58bf59919b7b413d194f20701207c1df4c (patch) | |
| tree | 8994a214667f6a2e1d6757f28de7e251232b4abd /api | |
| parent | 14e317a33c3cb7539f87ba10599a031f0371a96c (diff) | |
| parent | 7513aab4dfa33130fd846bf033f4878ae1c75914 (diff) | |
| download | frameworks_base-b1b0aa58bf59919b7b413d194f20701207c1df4c.zip frameworks_base-b1b0aa58bf59919b7b413d194f20701207c1df4c.tar.gz frameworks_base-b1b0aa58bf59919b7b413d194f20701207c1df4c.tar.bz2 | |
Merge "Revert "Use real screen size to scale duration""
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index dc7c41f..180f0d4 100644 --- a/api/current.txt +++ b/api/current.txt @@ -2880,7 +2880,7 @@ package android.animation { method public void removePauseListener(android.animation.Animator.AnimatorPauseListener); method public void resume(); method public abstract android.animation.Animator setDuration(long); - method public void setDurationScaleHint(android.content.Context, int); + method public void setDurationScaleHint(int, android.content.res.Resources); method public abstract void setInterpolator(android.animation.TimeInterpolator); method public abstract void setStartDelay(long); method public void setTarget(java.lang.Object); diff --git a/api/system-current.txt b/api/system-current.txt index 1837099..76c0261 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -2960,7 +2960,7 @@ package android.animation { method public void removePauseListener(android.animation.Animator.AnimatorPauseListener); method public void resume(); method public abstract android.animation.Animator setDuration(long); - method public void setDurationScaleHint(android.content.Context, int); + method public void setDurationScaleHint(int, android.content.res.Resources); method public abstract void setInterpolator(android.animation.TimeInterpolator); method public abstract void setStartDelay(long); method public void setTarget(java.lang.Object); |