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

Commit 1322fc37 authored by Vinit Nayak's avatar Vinit Nayak
Browse files

Fix translation for secondary split thumbnail in RTL 

Fix: 225157531
Test: Swipe up in RTL shows both thumbnails
were expected.

Change-Id: I87d286b6ce6542c7cffadf86e3d4d99a3618f984
parent 4cb55616

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

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ public class GroupedTaskView extends TaskView { 
        }

        getPagedOrientationHandler().measureGroupedTaskViewThumbnailBounds(mSnapshotView,

                mSnapshotView2, widthSize, heightSize, mSplitBoundsConfig,

                mActivity.getDeviceProfile());

                mActivity.getDeviceProfile(), getLayoutDirection() == LAYOUT_DIRECTION_RTL);

        updateIconPlacement();

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -454,8 +454,8 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler { 


    @Override

    public void measureGroupedTaskViewThumbnailBounds(View primarySnapshot, View secondarySnapshot,

            int parentWidth, int parentHeight,

            StagedSplitBounds splitBoundsConfig, DeviceProfile dp) {

            int parentWidth, int parentHeight, StagedSplitBounds splitBoundsConfig,

            DeviceProfile dp, boolean isRtl) {

        int spaceAboveSnapshot = dp.overviewTaskThumbnailTopMarginPx;

        int totalThumbnailHeight = parentHeight - spaceAboveSnapshot;

        int dividerBar = splitBoundsConfig.appsStackedVertically

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

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ public interface PagedOrientationHandler { 


    void measureGroupedTaskViewThumbnailBounds(View primarySnapshot, View secondarySnapshot,

            int parentWidth, int parentHeight,

            StagedSplitBounds splitBoundsConfig, DeviceProfile dp);

            StagedSplitBounds splitBoundsConfig, DeviceProfile dp, boolean isRtl);



    // Overview TaskMenuView methods

    void setTaskIconParams(FrameLayout.LayoutParams iconParams,

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

+10 −3
Original line number Diff line number Diff line
@@ -571,8 +571,8 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler { 


    @Override

    public void measureGroupedTaskViewThumbnailBounds(View primarySnapshot, View secondarySnapshot,

            int parentWidth, int parentHeight,

            StagedSplitBounds splitBoundsConfig, DeviceProfile dp) {

            int parentWidth, int parentHeight, StagedSplitBounds splitBoundsConfig,

            DeviceProfile dp, boolean isRtl) {

        int spaceAboveSnapshot = dp.overviewTaskThumbnailTopMarginPx;

        int totalThumbnailHeight = parentHeight - spaceAboveSnapshot;

        int dividerBar = splitBoundsConfig.appsStackedVertically
@@ -591,7 +591,13 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler { 
            secondarySnapshotHeight = totalThumbnailHeight;

            secondarySnapshotWidth = parentWidth - primarySnapshotWidth - dividerBar;

            int translationX = primarySnapshotWidth + dividerBar;

            if (isRtl) {

                primarySnapshot.setTranslationX(-translationX);

                secondarySnapshot.setTranslationX(0);

            } else {

                secondarySnapshot.setTranslationX(translationX);

                primarySnapshot.setTranslationX(0);

            }

            secondarySnapshot.setTranslationY(spaceAboveSnapshot);

        } else {

            primarySnapshotWidth = parentWidth;
@@ -602,6 +608,7 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler { 
            int translationY = primarySnapshotHeight + spaceAboveSnapshot + dividerBar;

            secondarySnapshot.setTranslationY(translationY);

            secondarySnapshot.setTranslationX(0);

            primarySnapshot.setTranslationX(0);

        }

        primarySnapshot.measure(

                View.MeasureSpec.makeMeasureSpec(primarySnapshotWidth, View.MeasureSpec.EXACTLY),