diff options
Diffstat (limited to 'src/com/android/contacts')
-rw-r--r-- | src/com/android/contacts/widget/MultiShrinkScroller.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/contacts/widget/MultiShrinkScroller.java b/src/com/android/contacts/widget/MultiShrinkScroller.java index 4a3aff4b2..0315cc54c 100644 --- a/src/com/android/contacts/widget/MultiShrinkScroller.java +++ b/src/com/android/contacts/widget/MultiShrinkScroller.java @@ -280,10 +280,15 @@ public class MultiShrinkScroller extends LinearLayout { private void expandCollapseHeader() { mPhotoView.setClickable(false); if (getHeaderHeight() != mMaximumHeaderHeight) { + // Expand header final ObjectAnimator animator = ObjectAnimator.ofInt(this, "headerHeight", mMaximumHeaderHeight); animator.addListener(mHeaderExpandAnimationListener); animator.start(); + // Scroll nested scroll view to its top + if (mScrollView.getScrollY() != 0) { + ObjectAnimator.ofInt(mScrollView, "scrollY", -mScrollView.getScrollY()).start(); + } } else if (getHeaderHeight() != mMinimumHeaderHeight) { final ObjectAnimator animator = ObjectAnimator.ofInt(this, "headerHeight", mIntermediateHeaderHeight); |