Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bb1a80e authored by Brian Attwell's avatar Brian Attwell Committed by Android (Google) Code Review
Browse files

Merge "Square QC contact photo on Volantis" into lmp-dev

parents ab54ea15 1e3d3a9a

src/com/android/contacts/widget/MultiShrinkScroller.java

+3 −2
Original line number Diff line number Diff line
@@ -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) {