Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ibf9d0fd91376392811c6f0fff148b26c4f900893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Prabir Pradhan
2023-06-09 16:18:23 +00:00
committed by Automerger Merge Worker
parent b9a4f5e5ff 4043adb4ea
commit 1f29813f5b
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/com/android/internal/widget/PointerLocationView.java
View File

@@ -359,20 +359,16 @@ public class PointerLocationView extends View implements InputDeviceListener,
// Draw current touch ellipse. // Draw current touch ellipse.
mPaint.setARGB(255, pressureLevel, 255 - pressureLevel, 128); mPaint.setARGB(255, pressureLevel, 255 - pressureLevel, 128);
drawOval(canvas, ps.mCoords.x, ps.mCoords.y, ps.mCoords.touchMajor * mDensity, drawOval(canvas, ps.mCoords.x, ps.mCoords.y, ps.mCoords.touchMajor,
ps.mCoords.touchMinor * mDensity, ps.mCoords.orientation, mPaint); ps.mCoords.touchMinor, ps.mCoords.orientation, mPaint);
// Draw current tool ellipse. // Draw current tool ellipse.
mPaint.setARGB(255, pressureLevel, 128, 255 - pressureLevel); mPaint.setARGB(255, pressureLevel, 128, 255 - pressureLevel);
drawOval(canvas, ps.mCoords.x, ps.mCoords.y, ps.mCoords.toolMajor * mDensity, drawOval(canvas, ps.mCoords.x, ps.mCoords.y, ps.mCoords.toolMajor,
ps.mCoords.toolMinor * mDensity, ps.mCoords.orientation, mPaint); ps.mCoords.toolMinor, ps.mCoords.orientation, mPaint);
// Draw the orientation arrow. // Draw the orientation arrow, and ensure it has a minimum size of 24dp.
float arrowSize = ps.mCoords.toolMajor * 0.7f; final float arrowSize = Math.max(ps.mCoords.toolMajor * 0.7f, 24 * mDensity);
if (arrowSize < 20) {
arrowSize = 20;
}
arrowSize *= mDensity;
mPaint.setARGB(255, pressureLevel, 255, 0); mPaint.setARGB(255, pressureLevel, 255, 0);
float orientationVectorX = (float) (Math.sin(ps.mCoords.orientation) float orientationVectorX = (float) (Math.sin(ps.mCoords.orientation)
* arrowSize); * arrowSize);