Merge "Fix color mismatch of pointers" am: e1c169c983 am: 23ff2399a1 am: 6cddd8d6b7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1362517

Change-Id: Ie024c5215c9c192702c5b4be4ee392199969fdef

core/java/com/android/internal/widget/PointerLocationView.java

@@ -371,7 +371,7 @@ public class PointerLocationView extends View implements InputDeviceListener,
                 }
                 if (haveLast) {
                     canvas.drawLine(lastX, lastY, x, y, mPathPaint);
-                    final Paint paint = ps.mTraceCurrent[i] ? mCurrentPointPaint : mPaint;
+                    final Paint paint = ps.mTraceCurrent[i - 1] ? mCurrentPointPaint : mPaint;
                     canvas.drawPoint(lastX, lastY, paint);
                     drawn = true;
                 }