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

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

Browse Source
This commit is contained in:
Sergey Pinkevich
2024-01-04 12:07:40 +00:00
committed by Android (Google) Code Review
parent e4b5ab6523 9b6587d80f
commit e8f4fbf012
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/touch/SeascapePagedViewHandler.java
+17 -6
View File
@@ -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,14 +295,25 @@ 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
primaryIconView.setTranslationY(-bottomToMidpointOffset - insetOffset
+ taskIconHeight);
secondaryIconView.setTranslationY(-bottomToMidpointOffset - insetOffset);
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
primaryIconView.setTranslationY(-bottomToMidpointOffset + taskIconHeight);
secondaryIconView.setTranslationY(-bottomToMidpointOffset);
if (isRtl) {
primaryIconView.setTranslationY(bottomToMidpointOffset);
secondaryIconView.setTranslationY(bottomToMidpointOffset + taskIconHeight);
} else {
primaryIconView.setTranslationY(-bottomToMidpointOffset + taskIconHeight);
secondaryIconView.setTranslationY(-bottomToMidpointOffset);
}
}
primaryIconView.setLayoutParams(primaryIconParams);