commit 1e3d3a9a2dd5f1a394bb7163fcefc072da774f5a
author Brian Attwell <brianattwell@google.com> Fri Aug 29 11:55:07 2014 -0700
committer Brian Attwell <brianattwell@google.com> Fri Aug 29 11:55:07 2014 -0700
tree de111ccb2bea66f853052ac872c569a45c3ac700
parent 1deb532faf5b7e00d42a6c1764147ebda0dd7072

Square QC contact photo on Volantis

Bug: 17329968
Change-Id: I8b832cbc2b841de272a1ebecf95fee5ea89f6fe2

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 c631dd5..e277f74 100644
--- a/src/com/android/contacts/widget/MultiShrinkScroller.java
+++ b/src/com/android/contacts/widget/MultiShrinkScroller.java
@@ -309,13 +309,14 @@
             public void run() {
                 if (!mIsTwoPanel) {
                     // We never want the height of the photo view to exceed its width.
-                    mMaximumHeaderHeight = getWidth();
+                    mMaximumHeaderHeight = mPhotoViewContainer.getWidth();
                     mIntermediateHeaderHeight = (int) (mMaximumHeaderHeight
                             * INTERMEDIATE_HEADER_HEIGHT_RATIO);
                 }
                 final boolean isLandscape = getResources().getConfiguration().orientation
                         == Configuration.ORIENTATION_LANDSCAPE;
-                mMaximumPortraitHeaderHeight = isLandscape ? getHeight() : getWidth();
+                mMaximumPortraitHeaderHeight = isLandscape ? getHeight()
+                        : mPhotoViewContainer.getWidth();
                 setHeaderHeight(getMaximumScrollableHeaderHeight());
                 mMaximumHeaderTextSize = mLargeTextView.getHeight();
                 if (mIsTwoPanel) {