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

Removing wrong dead code around direction matching

Browse Source 
Change-Id: Ic8349fcac4bfe6222b1cbf26e8cbb1810dc32298
This commit is contained in:
Sunny Goyal
2016-08-18 15:01:11 -07:00
parent ad9a25d4be
commit 8f90dcff37
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/CellLayout.java
+3 -6
View File
@@ -1356,12 +1356,9 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler {
// and that passed in. // and that passed in.
int curDirectionScore = direction[0] * curDirection[0] + int curDirectionScore = direction[0] * curDirection[0] +
direction[1] * curDirection[1]; direction[1] * curDirection[1];
boolean exactDirectionOnly = false; if (Float.compare(distance, bestDistance) < 0 ||
boolean directionMatches = direction[0] == curDirection[0] && (Float.compare(distance, bestDistance) == 0
direction[0] == curDirection[0]; && curDirectionScore > bestDirectionScore)) {
if ((directionMatches || !exactDirectionOnly) &&
Float.compare(distance, bestDistance) < 0 || (Float.compare(distance,
bestDistance) == 0 && curDirectionScore > bestDirectionScore)) {
bestDistance = distance; bestDistance = distance;
bestDirectionScore = curDirectionScore; bestDirectionScore = curDirectionScore;
bestXY[0] = x; bestXY[0] = x;