Merge "Correct GesturePreviewTrail.getWidth() implementation"
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index c7d9936..eb0934c 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -100,7 +100,7 @@
<fraction name="center_suggestion_percentile">36%</fraction>
<!-- Gesture preview trail parameters -->
- <dimen name="gesture_preview_trail_start_width">12.6dp</dimen>
+ <dimen name="gesture_preview_trail_start_width">10.0dp</dimen>
<dimen name="gesture_preview_trail_end_width">2.5dp</dimen>
<!-- Gesture floating preview text parameters -->
<dimen name="gesture_floating_preview_text_size">24dp</dimen>
diff --git a/java/src/com/android/inputmethod/keyboard/internal/GesturePreviewTrail.java b/java/src/com/android/inputmethod/keyboard/internal/GesturePreviewTrail.java
index 4a8407c..9f6945d 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/GesturePreviewTrail.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/GesturePreviewTrail.java
@@ -131,10 +131,8 @@
* @return the width of a gesture trail
*/
private static float getWidth(final int elapsedTime, final Params params) {
- final int deltaTime = params.mTrailLingerDuration - elapsedTime;
final float deltaWidth = params.mTrailStartWidth - params.mTrailEndWidth;
- return Math.max(
- (deltaTime * deltaWidth) / params.mTrailLingerDuration, params.mTrailEndWidth);
+ return params.mTrailStartWidth - (deltaWidth * elapsedTime) / params.mTrailLingerDuration;
}
private final RoundedLine mRoundedLine = new RoundedLine();