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

Merge "Fix flaky/failing two panel TAPL tests" into tm-qpr-dev am: 21064ef82a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19258808

Change-Id: Ic8cecbcb60c4cc2758da4a10519387c10a83b391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Chau
2022-10-10 16:25:42 +00:00
committed by Automerger Merge Worker
parent bf7afbcfc8 21064ef82a
commit 2a08b1c5b6
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/dragndrop/SpringLoadedDragController.java
+13 -4
View File
@@ -20,12 +20,14 @@ import com.android.launcher3.Alarm;
import com.android.launcher3.CellLayout;
import com.android.launcher3.Launcher;
import com.android.launcher3.OnAlarmListener;
import com.android.launcher3.Utilities;
import com.android.launcher3.Workspace;
public class SpringLoadedDragController implements OnAlarmListener {
// how long the user must hover over a mini-screen before it unshrinks
final long ENTER_SPRING_LOAD_HOVER_TIME = 500;
final long ENTER_SPRING_LOAD_CANCEL_HOVER_TIME = 950;
private static final long ENTER_SPRING_LOAD_HOVER_TIME = 500;
private static final long ENTER_SPRING_LOAD_HOVER_TIME_IN_TEST = 1500;
private static final long ENTER_SPRING_LOAD_CANCEL_HOVER_TIME = 950;
Alarm mAlarm;
@@ -39,6 +41,13 @@ public class SpringLoadedDragController implements OnAlarmListener {
mAlarm.setOnAlarmListener(this);
}
private long getEnterSpringLoadHoverTime() {
// Some TAPL tests are flaky on Cuttlefish with a low waiting time
return Utilities.IS_RUNNING_IN_TEST_HARNESS
? ENTER_SPRING_LOAD_HOVER_TIME_IN_TEST
: ENTER_SPRING_LOAD_HOVER_TIME;
}
public void cancel() {
mAlarm.cancelAlarm();
}
@@ -46,8 +55,8 @@ public class SpringLoadedDragController implements OnAlarmListener {
// Set a new alarm to expire for the screen that we are hovering over now
public void setAlarm(CellLayout cl) {
mAlarm.cancelAlarm();
mAlarm.setAlarm((cl == null) ? ENTER_SPRING_LOAD_CANCEL_HOVER_TIME :
ENTER_SPRING_LOAD_HOVER_TIME);
mAlarm.setAlarm((cl == null) ? ENTER_SPRING_LOAD_CANCEL_HOVER_TIME
: getEnterSpringLoadHoverTime());
mScreen = cl;
}