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

Merge "Add a tab to grab to CropView handles." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-02-23 22:29:51 +00:00
committed by Android (Google) Code Review
parent 1e696cb9fc c1ff52d211
commit 9a5aa08de2
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/SystemUI/src/com/android/systemui/screenshot/CropView.java
View File

@@ -97,8 +97,8 @@ public class CropView extends View {
float bottom = mBottomCrop + mBottomDelta;
drawShade(canvas, 0, top);
drawShade(canvas, bottom, 1f);
drawHandle(canvas, top);
drawHandle(canvas, bottom);
drawHandle(canvas, top, /* draw the handle tab down */ false);
drawHandle(canvas, bottom, /* draw the handle tab up */ true);
}
@Override
@@ -122,7 +122,7 @@ public class CropView extends View {
} else { // Bottom
mBottomDelta = pixelsToFraction((int) MathUtils.constrain(delta,
topPx + 2 * mCropTouchMargin - bottomPx,
getMeasuredHeight() - bottomPx));
getHeight() - bottomPx));
}
updateListener(event);
invalidate();
@@ -212,21 +212,25 @@ public class CropView extends View {
}
private void drawShade(Canvas canvas, float fracStart, float fracEnd) {
canvas.drawRect(0, fractionToPixels(fracStart), getMeasuredWidth(),
canvas.drawRect(0, fractionToPixels(fracStart), getWidth(),
fractionToPixels(fracEnd), mShadePaint);
}
private void drawHandle(Canvas canvas, float frac) {
private void drawHandle(Canvas canvas, float frac, boolean handleTabUp) {
int y = fractionToPixels(frac);
canvas.drawLine(0, y, getMeasuredWidth(), y, mHandlePaint);
canvas.drawLine(0, y, getWidth(), y, mHandlePaint);
float radius = 15 * getResources().getDisplayMetrics().density;
float x = getWidth() * .9f;
canvas.drawArc(x - radius, y - radius, x + radius, y + radius, handleTabUp ? 180 : 0, 180,
true, mHandlePaint);
}
private int fractionToPixels(float frac) {
return (int) (frac * getMeasuredHeight());
return (int) (frac * getHeight());
}
private float pixelsToFraction(int px) {
return px / (float) getMeasuredHeight();
return px / (float) getHeight();
}
private CropBoundary nearestBoundary(MotionEvent event, int topPx, int bottomPx) {