Merge "Wrong app icon position in seascape mode for RTL layout" into main (e8f4fbf0) · Commits · e / os / android_packages_apps_Trebuchet

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

+17 −6

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 (primaryIconView.getLayoutDirection() == LAYOUT_DIRECTION_RTL) {
		if (isRtl) {
		primaryIconView.setTranslationY(groupedTaskViewHeight - primarySnapshotHeight);
		secondaryIconView.setTranslationY(0);
		} else {
		@@ -295,15 +295,26 @@ 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);