summaryrefslogtreecommitdiffstats
path: root/src/com/android/contacts/widget
diff options
context:
space:
mode:
authorBrian Attwell <brianattwell@google.com>2014-06-12 18:04:16 -0700
committerBrian Attwell <brianattwell@google.com>2014-06-13 18:51:43 +0000
commit7fa11d1adfa876daef636104834cbb522b041aa9 (patch)
tree82fbf1e705f73580c5621ac94661aa7fd75b0476 /src/com/android/contacts/widget
parent64d3abcec966d48e5c0a0b5c53d6f17073a5b3a3 (diff)
downloadpackages_apps_Contacts-7fa11d1adfa876daef636104834cbb522b041aa9.tar.gz
packages_apps_Contacts-7fa11d1adfa876daef636104834cbb522b041aa9.tar.bz2
packages_apps_Contacts-7fa11d1adfa876daef636104834cbb522b041aa9.zip
Scroll scroll view to top on header clicked
Change-Id: Ie5a0c3276570bb6b059e9d56506cc80cac0025ca
Diffstat (limited to 'src/com/android/contacts/widget')
-rw-r--r--src/com/android/contacts/widget/MultiShrinkScroller.java5
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);