summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2015-04-18 00:14:14 +0000
committerDoris Liu <tianliu@google.com>2015-04-18 00:14:14 +0000
commit7513aab4dfa33130fd846bf033f4878ae1c75914 (patch)
treeed583da74cf511e7108f434c60e25948c70f4070 /api
parent5ed54c743c04e2bc349e12c31adb67cbc3094651 (diff)
downloadframeworks_base-7513aab4dfa33130fd846bf033f4878ae1c75914.zip
frameworks_base-7513aab4dfa33130fd846bf033f4878ae1c75914.tar.gz
frameworks_base-7513aab4dfa33130fd846bf033f4878ae1c75914.tar.bz2
Revert "Use real screen size to scale duration"
This reverts commit 5ed54c743c04e2bc349e12c31adb67cbc3094651. Reverting to avoid build breakage. Change-Id: Ib73056bb5a11e718cbc82db5917946bdf8db06dc
Diffstat (limited to 'api')
-rw-r--r--api/current.txt2
-rw-r--r--api/system-current.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index c5d4cdd..4a3b3dc 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -2879,7 +2879,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 7dcc8ac..4b283fe 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -2959,7 +2959,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);