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

Commit 4e36642c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use getMeasuredWidth instead of getWidth in setSplitIconParams" into... 

Merge "Use getMeasuredWidth instead of getWidth in setSplitIconParams" into sc-v2-dev am: ad890ac5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16388226

Change-Id: Ib70eeb70bc556885ba35912db78cf0f9518528a3
parents c0f76596 ad890ac5

quickstep/src/com/android/quickstep/views/GroupedTaskView.java

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ public class GroupedTaskView extends TaskView { 
        boolean isRtl = getLayoutDirection() == LAYOUT_DIRECTION_RTL;



        getPagedOrientationHandler().setSplitIconParams(mIconView, mIconView2,

                taskIconHeight, mSnapshotView.getWidth(), mSnapshotView.getHeight(),

                taskIconHeight, mSnapshotView.getMeasuredWidth(), mSnapshotView.getMeasuredHeight(),

                isRtl, deviceProfile, mSplitBoundsConfig);

    }

src/com/android/launcher3/touch/PortraitPagedViewHandler.java

+4 −3
Original line number Diff line number Diff line
@@ -541,17 +541,18 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler { 


        if (deviceProfile.isLandscape) {

            primaryIconParams.gravity = TOP | START;

            primaryIconView.setTranslationX(primarySnapshotWidth - primaryIconView.getWidth());

            primaryIconView.setTranslationX(

                    primarySnapshotWidth - primaryIconView.getMeasuredWidth());

            primaryIconView.setTranslationY(0);

            secondaryIconParams.gravity = TOP | START;

            secondaryIconView.setTranslationX(primarySnapshotWidth + dividerBar);

        } else {

            primaryIconParams.gravity = TOP | CENTER_HORIZONTAL;

            primaryIconView.setTranslationX(-(primaryIconView.getWidth()) / 2f);

            primaryIconView.setTranslationX(-(primaryIconView.getMeasuredWidth()) / 2f);

            primaryIconView.setTranslationY(0);



            secondaryIconParams.gravity = TOP | CENTER_HORIZONTAL;

            secondaryIconView.setTranslationX(secondaryIconView.getWidth() / 2f);

            secondaryIconView.setTranslationX(secondaryIconView.getMeasuredWidth() / 2f);

        }

        secondaryIconView.setTranslationY(0);

        primaryIconView.setLayoutParams(primaryIconParams);