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

Commit 11439c58 authored by Winson's avatar Winson Committed by Winson Chung
Browse files

Fixing small regressions from layout tweaks 

- Ensure that the caret is the right height
- Ensure that the workspace page spacing matches the workspace padding,
  but just offscreen

Bug: 30021487
Change-Id: Iaf4b33db0f6456b74986638fb6b6af78fc6e1859
parent 03340309

src/com/android/launcher3/DeviceProfile.java

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ public class DeviceProfile { 
            // In portrait, we want the pages spaced such that there is no

            // overhang of the previous / next page into the current page viewport.

            // We assume symmetrical padding in portrait mode.

            return Math.max(defaultPageSpacingPx, 2 * getWorkspacePadding(null).left);

            return Math.max(defaultPageSpacingPx, getWorkspacePadding(null).left + 1);

        }

    }

src/com/android/launcher3/pageindicators/PageIndicatorLineCaret.java

+2 −1
Original line number Diff line number Diff line
@@ -148,7 +148,8 @@ public class PageIndicatorLineCaret extends PageIndicator { 
        super.onLayout(changed, left, top, right, bottom);

        // Top/center align the caret in the page indicator space

        int l = (right - left) / 2 - mCaretSizePx / 2;

        getCaretDrawable().setBounds(l, mCaretWorkspaceOffsetPx, l + mCaretSizePx, mCaretSizePx);

        getCaretDrawable().setBounds(l, mCaretWorkspaceOffsetPx, l + mCaretSizePx,

                mCaretWorkspaceOffsetPx + mCaretSizePx);



        // The touch area is expanded below this view by #mTouchExtensionHeight

        // which extends to the top of the hotseat.