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

Merge "Make sure folder positioning is behind flag" into main

Browse Source
This commit is contained in:
Charlie Anderson
2025-03-04 10:39:26 -08:00
committed by Android (Google) Code Review
parent f979f6518b 9b001f527e
commit ded687da03
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java
+16 -12
View File
@@ -53,18 +53,22 @@ public class ClippedFolderIconLayoutRule {
} else if (index >= MAX_NUM_ITEMS_IN_PREVIEW) {
// Items beyond those displayed in the preview are animated to the center
mTmpPoint[0] = mTmpPoint[1] = mAvailableSpace / 2 - (mIconSize * totalScale) / 2;
} else if (index == 0) {
// top left
getGridPosition(0, 0, mTmpPoint);
} else if (index == 1) {
// top right
getGridPosition(0, 1, mTmpPoint);
} else if (index == 2) {
// bottom left
getGridPosition(1, 0, mTmpPoint);
} else if (index == 3) {
// bottom right
getGridPosition(1, 1, mTmpPoint);
} else if (Flags.enableLauncherIconShapes()) {
if (index == 0) {
// top left
getGridPosition(0, 0, mTmpPoint);
} else if (index == 1) {
// top right
getGridPosition(0, 1, mTmpPoint);
} else if (index == 2) {
// bottom left
getGridPosition(1, 0, mTmpPoint);
} else if (index == 3) {
// bottom right
getGridPosition(1, 1, mTmpPoint);
}
} else {
getPosition(index, curNumItems, mTmpPoint);
}
transX = mTmpPoint[0];