diff options
author | Brian Attwell <brianattwell@google.com> | 2014-06-18 14:52:04 -0700 |
---|---|---|
committer | Brian Attwell <brianattwell@google.com> | 2014-06-18 21:52:49 +0000 |
commit | 6feb9f3b14c321c03aefb783f1723c25c9ebcea5 (patch) | |
tree | 77515b457991fbadadc39748fc059479ef1b4053 /src/com/android/contacts/widget | |
parent | 5e0d0b9d2efe3c0a4a0172c590cfef94ec841146 (diff) | |
download | packages_apps_Contacts-6feb9f3b14c321c03aefb783f1723c25c9ebcea5.tar.gz packages_apps_Contacts-6feb9f3b14c321c03aefb783f1723c25c9ebcea5.tar.bz2 packages_apps_Contacts-6feb9f3b14c321c03aefb783f1723c25c9ebcea5.zip |
QC: Half expanded header should be tinted
UX request.
Change-Id: I83d3767a8ee86e60c7ab4c49d935e8902380957d
Diffstat (limited to 'src/com/android/contacts/widget')
-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) { |