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

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

am 825afde1: Merge "Fix RTL EdgeEffect in QC" into lmp-dev

* commit '825afde1':
  Fix RTL EdgeEffect in QC
parents 423411c4 825afde1
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -692,20 +692,23 @@ public class MultiShrinkScroller extends LinearLayout {

        if (!mEdgeGlowBottom.isFinished()) {
            final int restoreCount = canvas.save();
            final int width = getWidth() - getPaddingStart() - getPaddingEnd();
            final int width = getWidth() - getPaddingLeft() - getPaddingRight();
            final int height = getHeight();

            // Draw the EdgeEffect on the bottom of the Window (Or a little bit below the bottom
            // of the Window if we start to scroll upwards while EdgeEffect is visible). This
            // does not need to consider the case where this MultiShrinkScroller doesn't fill
            // the Window, since the nested ScrollView should be set to fillViewport.
            canvas.translate(-width + getPaddingStart(),
            canvas.translate(-width + getPaddingLeft(),
                    height + getMaximumScrollUpwards() - getScroll());

            canvas.rotate(180, width, 0);
            if (mIsTwoPanel) {
                // Only show the EdgeEffect on the bottom of the ScrollView.
                mEdgeGlowBottom.setSize(mScrollView.getWidth(), height);
                if (isLayoutRtl()) {
                    canvas.translate(mPhotoViewContainer.getWidth(), 0);
                }
            } else {
                mEdgeGlowBottom.setSize(width, height);
            }