Merge "Do not round corners on tall selection rectangles"

1 files changed, 11 insertions, 1 deletions

diff --git a/core/java/android/widget/SmartSelectSprite.java b/core/java/android/widget/SmartSelectSprite.java
index 94109d741fd8..1c4f02f4e04e 100644
--- a/core/java/android/widget/SmartSelectSprite.java
+++ b/core/java/android/widget/SmartSelectSprite.java
@@ -156,6 +156,12 @@ final class SmartSelectSprite {
             mExpansionDirection = expansionDirection;
             mRectangleBorderType = rectangleBorderType;
             mStrokeWidth = strokeWidth;
+
+            if (boundingRectangle.height() > boundingRectangle.width()) {
+                setRoundPercentage(0.0f);
+            } else {
+                setRoundPercentage(1.0f);
+            }
         }
 
         /*
@@ -220,6 +226,10 @@ final class SmartSelectSprite {
             mRoundPercentage = newPercentage;
         }
 
+        public float getRoundPercentage() {
+            return mRoundPercentage;
+        }
+
         private void setLeftBoundary(final float leftBoundary) {
             mLeftBoundary = leftBoundary;
         }
@@ -577,7 +587,7 @@ final class SmartSelectSprite {
         final ObjectAnimator animator = ObjectAnimator.ofFloat(
                 shape,
                 RoundedRectangleShape.PROPERTY_ROUND_PERCENTAGE,
-                1.0F, 0.0F);
+                shape.getRoundPercentage(), 0.0F);
         animator.setDuration(CORNER_DURATION);
         animator.addUpdateListener(listener);
         animator.setInterpolator(mCornerInterpolator);