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

Merge "Improve starting offset calculation"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-10-09 11:56:42 +00:00
committed by Android (Google) Code Review
parent 70dc1ba4bb 98d3f0a820
commit 9eb155567d
1 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/java/android/widget/SmartSelectSprite.java
View File

@@ -206,7 +206,7 @@ final class SmartSelectSprite {
if (mRectangleBorderType == RectangleBorderType.OVERSHOOT) {
mDrawRect.left -= cornerRadius / 2;
mDrawRect.right -= cornerRadius / 2;
mDrawRect.right += cornerRadius / 2;
} else {
switch (mExpansionDirection) {
case ExpansionDirection.CENTER:
@@ -437,6 +437,7 @@ final class SmartSelectSprite {
RectangleWithTextSelectionLayout centerRectangle = null;
int startingOffset = 0;
int startingRectangleIndex = 0;
for (int index = 0; index < rectangleCount; ++index) {
final RectangleWithTextSelectionLayout rectangleWithTextSelectionLayout =
destinationRectangles.get(index);
@@ -446,6 +447,7 @@ final class SmartSelectSprite {
break;
}
startingOffset += rectangle.width();
++startingRectangleIndex;
}
if (centerRectangle == null) {
@@ -454,10 +456,6 @@ final class SmartSelectSprite {
startingOffset += start.x - centerRectangle.getRectangle().left;
final float centerRectangleHalfHeight = centerRectangle.getRectangle().height() / 2;
final float startingOffsetLeft = startingOffset - centerRectangleHalfHeight;
final float startingOffsetRight = startingOffset + centerRectangleHalfHeight;
final @RoundedRectangleShape.ExpansionDirection int[] expansionDirections =
generateDirections(centerRectangle, destinationRectangles);
@@ -482,6 +480,30 @@ final class SmartSelectSprite {
final RectangleList rectangleList = new RectangleList(shapes);
final ShapeDrawable shapeDrawable = new ShapeDrawable(rectangleList);
final float startingOffsetLeft;
final float startingOffsetRight;
final RoundedRectangleShape startingRectangleShape = shapes.get(startingRectangleIndex);
final float cornerRadius = startingRectangleShape.getCornerRadius();
if (startingRectangleShape.mRectangleBorderType
== RoundedRectangleShape.RectangleBorderType.FIT) {
switch (startingRectangleShape.mExpansionDirection) {
case RoundedRectangleShape.ExpansionDirection.LEFT:
startingOffsetLeft = startingOffsetRight = startingOffset - cornerRadius / 2;
break;
case RoundedRectangleShape.ExpansionDirection.RIGHT:
startingOffsetLeft = startingOffsetRight = startingOffset + cornerRadius / 2;
break;
case RoundedRectangleShape.ExpansionDirection.CENTER: // fall through
default:
startingOffsetLeft = startingOffset - cornerRadius / 2;
startingOffsetRight = startingOffset + cornerRadius / 2;
break;
}
} else {
startingOffsetLeft = startingOffsetRight = startingOffset;
}
final Paint paint = shapeDrawable.getPaint();
paint.setColor(mStrokeColor);
paint.setStyle(Paint.Style.STROKE);