Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f29813f authored by Prabir Pradhan's avatar Prabir Pradhan Committed by Automerger Merge Worker
Browse files

Merge "PointerLocationView: Do not scale touch and tool axes when drawing"... 

Merge "PointerLocationView: Do not scale touch and tool axes when drawing" into udc-qpr-dev am: 4043adb4

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



Change-Id: Ibf9d0fd91376392811c6f0fff148b26c4f900893
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b9a4f5e5 4043adb4

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

+6 −10
Original line number Diff line number Diff line
@@ -359,20 +359,16 @@ public class PointerLocationView extends View implements InputDeviceListener, 


                // Draw current touch ellipse.

                mPaint.setARGB(255, pressureLevel, 255 - pressureLevel, 128);

                drawOval(canvas, ps.mCoords.x, ps.mCoords.y, ps.mCoords.touchMajor * mDensity,

                        ps.mCoords.touchMinor * mDensity, ps.mCoords.orientation, mPaint);

                drawOval(canvas, ps.mCoords.x, ps.mCoords.y, ps.mCoords.touchMajor,

                        ps.mCoords.touchMinor, ps.mCoords.orientation, mPaint);



                // Draw current tool ellipse.

                mPaint.setARGB(255, pressureLevel, 128, 255 - pressureLevel);

                drawOval(canvas, ps.mCoords.x, ps.mCoords.y, ps.mCoords.toolMajor * mDensity,

                        ps.mCoords.toolMinor * mDensity, ps.mCoords.orientation, mPaint);

                drawOval(canvas, ps.mCoords.x, ps.mCoords.y, ps.mCoords.toolMajor,

                        ps.mCoords.toolMinor, ps.mCoords.orientation, mPaint);



                // Draw the orientation arrow.

                float arrowSize = ps.mCoords.toolMajor * 0.7f;

                if (arrowSize < 20) {

                    arrowSize = 20;

                }

                arrowSize *= mDensity;

                // Draw the orientation arrow, and ensure it has a minimum size of 24dp.

                final float arrowSize = Math.max(ps.mCoords.toolMajor * 0.7f, 24 * mDensity);

                mPaint.setARGB(255, pressureLevel, 255, 0);

                float orientationVectorX = (float) (Math.sin(ps.mCoords.orientation)

                        * arrowSize);