diff options
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/contacts/widget/MultiShrinkScroller.java | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/com/android/contacts/widget/MultiShrinkScroller.java b/src/com/android/contacts/widget/MultiShrinkScroller.java index 53179f5b7..d8b93aaaa 100644 --- a/src/com/android/contacts/widget/MultiShrinkScroller.java +++ b/src/com/android/contacts/widget/MultiShrinkScroller.java @@ -568,7 +568,7 @@ public class MultiShrinkScroller extends LinearLayout { 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; } @@ -576,14 +576,13 @@ public class MultiShrinkScroller extends LinearLayout { 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) { |