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

Commit 387e99f4 authored by Sergey Pinkevich's avatar Sergey Pinkevich Committed by Android (Google) Code Review
Browse files

Revert "Wrong app icon position in seascape mode for RTL layout" 

This reverts commit 9b6587d8.

Reason for revert: Show app icons in wrong order

Change-Id: I0fcc6b6f6431a8e596a504f5f7eb2c2d533be887
parent 9b6587d8

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

+6 −17
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ public class SeascapePagedViewHandler extends LandscapePagedViewHandler { 
        primaryIconView.setTranslationX(0);

        secondaryIconView.setTranslationX(0);

        if (enableOverviewIconMenu()) {

            if (isRtl) {

            if (primaryIconView.getLayoutDirection() == LAYOUT_DIRECTION_RTL) {

                primaryIconView.setTranslationY(groupedTaskViewHeight - primarySnapshotHeight);

                secondaryIconView.setTranslationY(0);

            } else {
@@ -295,26 +295,15 @@ public class SeascapePagedViewHandler extends LandscapePagedViewHandler { 
        } else if (splitConfig.initiatedFromSeascape) {

            // if the split was initiated from seascape,

            // the task on the right (secondary) is slightly larger

            if (isRtl) {

                primaryIconView.setTranslationY(bottomToMidpointOffset - insetOffset);

                secondaryIconView.setTranslationY(bottomToMidpointOffset - insetOffset

                        + taskIconHeight);

            } else {

            primaryIconView.setTranslationY(-bottomToMidpointOffset - insetOffset

                    + taskIconHeight);

            secondaryIconView.setTranslationY(-bottomToMidpointOffset - insetOffset);

            }

        } else {

            // if not,

            // the task on the left (primary) is slightly larger

            if (isRtl) {

                primaryIconView.setTranslationY(bottomToMidpointOffset);

                secondaryIconView.setTranslationY(bottomToMidpointOffset + taskIconHeight);

            } else {

            primaryIconView.setTranslationY(-bottomToMidpointOffset + taskIconHeight);

            secondaryIconView.setTranslationY(-bottomToMidpointOffset);

        }

        }



        primaryIconView.setLayoutParams(primaryIconParams);

        secondaryIconView.setLayoutParams(secondaryIconParams);