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

Commit 76263c2d authored by Luca Zuccarini's avatar Luca Zuccarini Committed by Android (Google) Code Review
Browse files

Merge "Ensure that the Hotseat respects the margins of the QSB." into tm-dev

parents 33b858d4 5c65febb

src/com/android/launcher3/Hotseat.java

+9 −3
Original line number Diff line number Diff line
@@ -173,9 +173,15 @@ public class Hotseat extends CellLayout implements Insettable { 
    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        super.onMeasure(widthMeasureSpec, heightMeasureSpec);



        int width = mActivity.getDeviceProfile().isQsbInline

                ? mActivity.getDeviceProfile().qsbWidth

                : getShortcutsAndWidgets().getMeasuredWidth();

        int width;

        if (mActivity.getDeviceProfile().isQsbInline) {

            width = mActivity.getDeviceProfile().qsbWidth;

        } else {

            MarginLayoutParams qsbParams = (MarginLayoutParams) mQsb.getLayoutParams();

            width = getShortcutsAndWidgets().getMeasuredWidth()

                    - qsbParams.getMarginStart()

                    - qsbParams.getMarginEnd();

        }



        mQsb.measure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),

                MeasureSpec.makeMeasureSpec(mQsbHeight, MeasureSpec.EXACTLY));