commit f7f2eaeaba82673f74c729e5ea1b0373cfb0ceee
author Brian Attwell <brianattwell@google.com> Wed Jun 18 23:03:02 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 18 22:47:18 2014 +0000
tree 8a8a60b9bc0bd24ca04a98e5bf082eb6a5ad2175
parent 6feb9f3b14c321c03aefb783f1723c25c9ebcea5
parent b442dc78781e5b9edc9425342525b573b048be13

Merge "snapToBottom() uses non janky interpolator"

src/com/android/contacts/widget/MultiShrinkScroller.java

diff --git a/src/com/android/contacts/widget/MultiShrinkScroller.java b/src/com/android/contacts/widget/MultiShrinkScroller.java
index 1a0438c..e05de0b 100644
--- a/src/com/android/contacts/widget/MultiShrinkScroller.java
+++ b/src/com/android/contacts/widget/MultiShrinkScroller.java
@@ -583,7 +583,7 @@
         final int toolbarHeight = mToolbar.getLayoutParams().height;
         // Reuse an existing mColorFilter (to avoid GC pauses) to change the photo's tint.
         mPhotoView.clearColorFilter();
-        if (toolbarHeight >= mIntermediateHeaderHeight) {
+        if (toolbarHeight >= mMaximumHeaderHeight) {
             mPhotoViewContainer.setElevation(0);
             return;
         }
@@ -591,14 +591,13 @@
             mColorFilter.setColor(mHeaderTintColor);
             mPhotoView.setColorFilter(mColorFilter);
             mPhotoViewContainer.setElevation(mToolbarElevation);
-        } else if (toolbarHeight <= mIntermediateHeaderHeight) {
-            mPhotoViewContainer.setElevation(0);
-            final int alphaBits = 0xff - 0xff * (toolbarHeight  - mMinimumHeaderHeight)
-                    / (mIntermediateHeaderHeight - mMinimumHeaderHeight);
-            final int color = alphaBits << 24 | (mHeaderTintColor & 0xffffff);
-            mColorFilter.setColor(color);
-            mPhotoView.setColorFilter(mColorFilter);
         }
+        mPhotoViewContainer.setElevation(0);
+        final int alphaBits = 0xff - 0xff * (toolbarHeight  - mMinimumHeaderHeight)
+                / (mMaximumHeaderHeight - mMinimumHeaderHeight);
+        final int color = alphaBits << 24 | (mHeaderTintColor & 0xffffff);
+        mColorFilter.setColor(color);
+        mPhotoView.setColorFilter(mColorFilter);
     }
 
     private void updateLastEventPosition(MotionEvent event) {