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

Revert change to rotateBounds

Browse Source 
Reason: Breaking Tapl tests.

Bug: 353965234
Flag: EXEMPT bugfix
Test: UtilitiesTest.kt
Change-Id: I2c513a190e5e9cba3f27b14c3835d3b039241467
This commit is contained in:
Sebastian Franco
2024-07-22 15:04:57 -07:00
parent 1749bf0308
commit 28e89bd10f
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Utilities.java
+2 -4
View File
@@ -746,7 +746,8 @@ public final class Utilities {
* | +--+ |
* | |
* +----------------+
* This would be case delta % 4 == 2:
* This would be case delta % 4 == 2: // This is case was reverted to previous behaviour which
* doesn't match the illustration due to b/353965234
* +-------------+
* | |
* | |
@@ -768,7 +769,6 @@ public final class Utilities {
int delta) {
int rdelta = ((delta % 4) + 4) % 4;
int origLeft = inOutBounds.left;
int origTop = inOutBounds.top;
switch (rdelta) {
case 0:
return;
@@ -780,8 +780,6 @@ public final class Utilities {
return;
case 2:
inOutBounds.left = parentWidth - inOutBounds.right;
inOutBounds.top = parentHeight - inOutBounds.bottom;
inOutBounds.bottom = parentHeight - origTop;
inOutBounds.right = parentWidth - origLeft;
return;
case 3:
tests/multivalentTests/src/com/android/launcher3/UtilitiesTest.kt
+4 -3
View File
@@ -376,9 +376,10 @@ class UtilitiesTest {
Utilities.rotateBounds(rect, 100, 100, 1)
assertEquals(Rect(70, 40, 80, 80), rect)
rect = Rect(20, 70, 60, 80)
Utilities.rotateBounds(rect, 100, 100, 2)
assertEquals(Rect(40, 20, 80, 30), rect)
// case removed for b/28435189
// rect = Rect(20, 70, 60, 80)
// Utilities.rotateBounds(rect, 100, 100, 2)
// assertEquals(Rect(40, 20, 80, 30), rect)
rect = Rect(20, 70, 60, 80)
Utilities.rotateBounds(rect, 100, 100, 3)