commit 9ee6a3fbb89698ebd7c26d4a86e2892a37a0d87a
author Aurimas Liutikas <aurimas@google.com> Thu May 19 14:10:17 2016 -0700
committer Aurimas Liutikas <aurimas@google.com> Thu May 19 14:10:17 2016 -0700
tree e40663091e85d42bd3072f62c3445409d05a083e
parent 77b9c767d2704465ad64405e96fee7ac204950ab

Actually change api to use long in CollapsingToolbarLayout.

Bug: 28775495
Change-Id: I25d3ff3007914ac1db0abb8f9b151b9cac4ca0e3

design/api/current.txt

diff --git a/design/api/current.txt b/design/api/current.txt
index f3e563c..aefeea2 100644
--- a/design/api/current.txt
+++ b/design/api/current.txt
@@ -145,7 +145,7 @@
     method public void setExpandedTitleMarginTop(int);
     method public void setExpandedTitleTextAppearance(int);
     method public void setExpandedTitleTypeface(android.graphics.Typeface);
-    method public void setScrimAnimationDuration(int);
+    method public void setScrimAnimationDuration(long);
     method public void setScrimVisibleHeightTrigger(int);
     method public void setScrimsShown(boolean);
     method public void setScrimsShown(boolean, boolean);

design/src/android/support/design/widget/CollapsingToolbarLayout.java

diff --git a/design/src/android/support/design/widget/CollapsingToolbarLayout.java b/design/src/android/support/design/widget/CollapsingToolbarLayout.java
index e8f593e..2181a1c 100644
--- a/design/src/android/support/design/widget/CollapsingToolbarLayout.java
+++ b/design/src/android/support/design/widget/CollapsingToolbarLayout.java
@@ -1034,7 +1034,7 @@
      *
      * @attr ref android.support.design.R.styleable#CollapsingToolbarLayout_scrimAnimationDuration
      */
-    public void setScrimAnimationDuration(@IntRange(from = 0) final int duration) {
+    public void setScrimAnimationDuration(@IntRange(from = 0) final long duration) {
         mScrimAnimationDuration = duration;
     }