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

Commit bf527ce9 authored by Brian Attwell's avatar Brian Attwell Committed by Android Git Automerger
Browse files

am b6f3a94d: Merge "Fix QC title translation near bottom of screen" into lmp-dev

* commit 'b6f3a94d':
  Fix QC title translation near bottom of screen
parents 427feda3 b6f3a94d
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -954,10 +954,14 @@ public class MultiShrinkScroller extends FrameLayout {
        // How offset the title should be from the bottom of the toolbar
        final int pretendBottomMargin =  (int) (mCollapsedTitleBottomMargin * (1 - x)
                + mMaximumTitleMargin * x) ;
        // Calculate how offset the title should be from the top of the screen.
        // Calculate how offset the title should be from the top of the screen. Instead of
        // calling mLargeTextView.getHeight() use the mMaximumHeaderTextSize for this calculation.
        // The getHeight() value acts unexpectedly when mLargeTextView is partially clipped by
        // its parent.
        titleLayoutParams.topMargin = getTransparentViewHeight()
                + toolbarLayoutParams.height - pretendBottomMargin
                - mLargeTextView.getHeight();
                - mMaximumHeaderTextSize;
        titleLayoutParams.bottomMargin = 0;
        mLargeTextView.setLayoutParams(titleLayoutParams);
    }