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

Commit 2c47b340 authored by Brian Attwell's avatar Brian Attwell
Browse files

Revert "Keep landscape quickcontact title on screen" 

This reverts commit d9ce069a.
In order to finish b/17417615, we needed to make some additional
design changes. Instead, lets revert the first CL and work
on this bug later.

Bug: 17417615
Change-Id: I0acd95eb437d5d7a327605eb89e7c3f5d1699d22
parent d9ce069a

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

+1 −19
Original line number Diff line number Diff line
@@ -375,13 +375,6 @@ public class MultiShrinkScroller extends FrameLayout { 
        mTitleGradientView.setLayoutParams(titleGradientLayoutParams);

    }



    private void setTitleGradientViewBottomMargin(int bottomMargin) {

        final FrameLayout.LayoutParams titleGradientLayoutParams

                = (FrameLayout.LayoutParams) mTitleGradientView.getLayoutParams();

        titleGradientLayoutParams.bottomMargin = bottomMargin;

        mTitleGradientView.setLayoutParams(titleGradientLayoutParams);

    }



    public void setTitle(String title) {

        mLargeTextView.setText(title);

        mPhotoTouchInterceptOverlay.setContentDescription(title);
@@ -949,18 +942,7 @@ public class MultiShrinkScroller extends FrameLayout { 
     */

    private void updateHeaderTextSizeAndMargin() {

        if (mIsTwoPanel) {

            // This is the amount of additional padding needed to keep the title text on screen.

            final int transparentHeight = mTransparentView.getLayoutParams().height;

            // We want to keep the title text on screen as we scroll, up to a point. Once we

            // scroll farther off the screen than the semi collapsed starting height, stop

            // compensating for scrolling.

            final int scrollCompensation = Math.min(transparentHeight, mTransparentStartHeight);

            mLargeTextView.setPadding(mLargeTextView.getPaddingLeft(),

                    mLargeTextView.getPaddingTop(), mLargeTextView.getPaddingRight(),

                    scrollCompensation);

            // Use margin to offset the title gradient instead of padding. This is necessary since

            // GradientDrawable appears to ignore the insets suggested by its View's padding.

            setTitleGradientViewBottomMargin(scrollCompensation);

            // The text size stays at a constant size & location in two panel layouts.

            return;

        }