PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sergey Pinkevich
2024-01-04 17:54:32 +00:00
committed by Android (Google) Code Review
parent 97e6c9c214 387e99f4bc
commit f78644b4eb
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/touch/SeascapePagedViewHandler.java
+6 -17
View File
@@ -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,25 +295,14 @@ 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);
}
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.setTranslationY(-bottomToMidpointOffset + taskIconHeight);
secondaryIconView.setTranslationY(-bottomToMidpointOffset);
}
primaryIconView.setLayoutParams(primaryIconParams);