nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 1dbec26f: Merge "Fix gesture trail width calculation" 

* commit '1dbec26f8fab31239e1abd53faa9d20d44383b85':
  Fix gesture trail width calculation
main
Tadashi G. Takaoka 2012-12-26 19:03:26 -08:00 committed by Android Git Automerger
parent bb043cff62 1dbec26f8f
commit e9bbde880b
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
java/src/com/android/inputmethod/keyboard/internal/GesturePreviewTrail.java
View File

@ -101,6 +101,16 @@ final class GesturePreviewTrail {
} }
} }
/**
* Calculate the alpha of a gesture trail.
* A gesture trail starts from fully opaque. After mFadeStartDelay has been passed, the alpha
* of a trail reduces in proportion to the elapsed time. Then after mFadeDuration has been
* passed, a trail becomes fully transparent.
*
* @param elapsedTime the elapsed time since a trail has been made.
* @param params gesture trail display parameters
* @return the width of a gesture trail
*/
private static int getAlpha(final int elapsedTime, final Params params) { private static int getAlpha(final int elapsedTime, final Params params) {
if (elapsedTime < params.mFadeoutStartDelay) { if (elapsedTime < params.mFadeoutStartDelay) {
return Constants.Color.ALPHA_OPAQUE; return Constants.Color.ALPHA_OPAQUE;
@ -111,10 +121,19 @@ final class GesturePreviewTrail {
return Constants.Color.ALPHA_OPAQUE - decreasingAlpha; return Constants.Color.ALPHA_OPAQUE - decreasingAlpha;
} }
/**
* Calculate the width of a gesture trail.
* A gesture trail starts from the width of mTrailStartWidth and reduces its width in proportion
* to the elapsed time. After mTrailEndWidth has been passed, the width becomes mTraiLEndWidth.
*
* @param elapsedTime the elapsed time since a trail has been made.
* @param params gesture trail display parameters
* @return the width of a gesture trail
*/
private static float getWidth(final int elapsedTime, final Params params) { private static float getWidth(final int elapsedTime, final Params params) {
return Math.max((params.mTrailLingerDuration - elapsedTime) final int deltaTime = params.mTrailLingerDuration - elapsedTime;
* (params.mTrailStartWidth - params.mTrailEndWidth) final float deltaWidth = params.mTrailStartWidth - params.mTrailEndWidth;
/ params.mTrailLingerDuration, 0.0f); return (deltaTime * deltaWidth) / params.mTrailLingerDuration + params.mTrailEndWidth;
} }
private final RoundedLine mRoundedLine = new RoundedLine(); private final RoundedLine mRoundedLine = new RoundedLine();
@ -154,7 +173,7 @@ final class GesturePreviewTrail {
final RoundedLine line = mRoundedLine; final RoundedLine line = mRoundedLine;
int p1x = getXCoordValue(xCoords[startIndex]); int p1x = getXCoordValue(xCoords[startIndex]);
int p1y = yCoords[startIndex]; int p1y = yCoords[startIndex];
int lastTime = sinceDown - eventTimes[startIndex]; final int lastTime = sinceDown - eventTimes[startIndex];
float maxWidth = getWidth(lastTime, params); float maxWidth = getWidth(lastTime, params);
float r1 = maxWidth / 2.0f; float r1 = maxWidth / 2.0f;
// Initialize bounds rectangle. // Initialize bounds rectangle.
@ -167,20 +186,19 @@ final class GesturePreviewTrail {
final float r2 = width / 2.0f; final float r2 = width / 2.0f;
// Draw trail line only when the current point isn't a down point. // Draw trail line only when the current point isn't a down point.
if (!isDownEventXCoord(xCoords[i])) { if (!isDownEventXCoord(xCoords[i])) {
final int alpha = getAlpha(elapsedTime, params);
paint.setAlpha(alpha);
final Path path = line.makePath(p1x, p1y, r1, p2x, p2y, r2); final Path path = line.makePath(p1x, p1y, r1, p2x, p2y, r2);
if (path != null) { if (path != null) {
final int alpha = getAlpha(elapsedTime, params);
paint.setAlpha(alpha);
canvas.drawPath(path, paint); canvas.drawPath(path, paint);
// Take union for the bounds.
outBoundsRect.union(p2x, p2y); outBoundsRect.union(p2x, p2y);
maxWidth = Math.max(maxWidth, width);
} }
// Take union for the bounds.
maxWidth = Math.max(maxWidth, width);
} }
p1x = p2x; p1x = p2x;
p1y = p2y; p1y = p2y;
r1 = r2; r1 = r2;
lastTime = elapsedTime;
} }
// Take care of trail line width. // Take care of trail line width.
final int inset = -((int)maxWidth + 1); final int inset = -((int)maxWidth + 1);