Merging from ub-launcher3-rvc-dev @ build 6577335

Bug: 150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-rvc-dev_6577335.html

Change-Id: Ie1f44dd646088759fef66251fe9e5f584b804d73
This commit is contained in:
Pinyao Ting
2020-06-10 14:45:53 -07:00
260 changed files with 2374 additions and 3390 deletions

View File

@@ -26,7 +26,6 @@ import android.annotation.TargetApi;
import android.content.Context;
import android.os.Build;
import android.os.Handler;
import android.util.Log;
import androidx.annotation.BinderThread;
import androidx.annotation.UiThread;
@@ -154,16 +153,8 @@ public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCo
// Because t=0 has the app icon in its original spot, we can skip the
// first frame and have the same movement one frame earlier.
int singleFrameMs = getSingleFrameMs(context);
long playTime = singleFrameMs;
// b/153821199 Add logs to debug crash but ensure release builds do not crash.
if (Utilities.IS_DEBUG_DEVICE) {
Log.e(TAG, "Total duration=[" + mAnimator.getTotalDuration()
+ "], singleFrameMs=[" + singleFrameMs + "], mAnimator=" + mAnimator);
} else {
playTime = Math.min(singleFrameMs, mAnimator.getTotalDuration());
}
mAnimator.setCurrentPlayTime(playTime);
mAnimator.setCurrentPlayTime(
Math.min(getSingleFrameMs(context), mAnimator.getTotalDuration()));
}
}
}