Merge "Import translations. DO NOT MERGE ANYWHERE" into main
diff --git a/src/com/android/launcher3/statemanager/StateManager.java b/src/com/android/launcher3/statemanager/StateManager.java
index ac07c0f..303290d 100644
--- a/src/com/android/launcher3/statemanager/StateManager.java
+++ b/src/com/android/launcher3/statemanager/StateManager.java
@@ -253,7 +253,7 @@
if (mConfig.currentAnimation == null) {
// Run any queued runnable
if (listener != null) {
- listener.onAnimationEnd(null);
+ listener.onAnimationEnd(new AnimatorSet());
}
return;
} else if ((!mConfig.isUserControlled() && animated && mConfig.targetState == state)
@@ -282,7 +282,7 @@
// Run any queued runnable
if (listener != null) {
- listener.onAnimationEnd(null);
+ listener.onAnimationEnd(new AnimatorSet());
}
return;
}
diff --git a/tests/src/com/android/launcher3/celllayout/integrationtest/events/TestEventsEmitterImplementation.kt b/tests/src/com/android/launcher3/celllayout/integrationtest/events/TestEventsEmitterImplementation.kt
index 365ad4b..5e062d0 100644
--- a/tests/src/com/android/launcher3/celllayout/integrationtest/events/TestEventsEmitterImplementation.kt
+++ b/tests/src/com/android/launcher3/celllayout/integrationtest/events/TestEventsEmitterImplementation.kt
@@ -35,9 +35,10 @@
companion object {
private const val TAG = "EventWaiter"
+ private val SIGNAL_TIMEOUT = TimeUnit.SECONDS.toMillis(5)
}
- fun waitForSignal(timeout: Long = TimeUnit.SECONDS.toMillis(10)) = runBlocking {
+ fun waitForSignal(timeout: Long = SIGNAL_TIMEOUT) = runBlocking {
var status = withTimeoutOrNull(timeout) { deferrable.await() }
if (status == null) {
status = EventStatus.TIMEOUT