diff options
| author | Brian Attwell <brianattwell@google.com> | 2014-08-29 11:55:07 -0700 |
|---|---|---|
| committer | Brian Attwell <brianattwell@google.com> | 2014-08-29 11:55:07 -0700 |
| commit | 1e3d3a9a2dd5f1a394bb7163fcefc072da774f5a (patch) | |
| tree | de111ccb2bea66f853052ac872c569a45c3ac700 /src | |
| parent | 1deb532faf5b7e00d42a6c1764147ebda0dd7072 (diff) | |
| download | packages_apps_Contacts-1e3d3a9a2dd5f1a394bb7163fcefc072da774f5a.tar.gz packages_apps_Contacts-1e3d3a9a2dd5f1a394bb7163fcefc072da774f5a.tar.bz2 packages_apps_Contacts-1e3d3a9a2dd5f1a394bb7163fcefc072da774f5a.zip | |
Square QC contact photo on Volantis
Bug: 17329968
Change-Id: I8b832cbc2b841de272a1ebecf95fee5ea89f6fe2
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/contacts/widget/MultiShrinkScroller.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/contacts/widget/MultiShrinkScroller.java b/src/com/android/contacts/widget/MultiShrinkScroller.java index c631dd568..e277f74b1 100644 --- a/src/com/android/contacts/widget/MultiShrinkScroller.java +++ b/src/com/android/contacts/widget/MultiShrinkScroller.java @@ -309,13 +309,14 @@ public class MultiShrinkScroller extends FrameLayout { 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) { |