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

Merge "Fix clamped starting position, seek bar hotspot bounds"

Browse Source
This commit is contained in:
Alan Viverette
2014-06-19 01:06:39 +00:00
committed by Android (Google) Code Review
parent 29fa90490b 304624100b
commit 88dc8f1e41
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/AbsSeekBar.java
View File

@@ -467,8 +467,8 @@ public abstract class AbsSeekBar extends ProgressBar {
final Rect bounds = thumb.getBounds();
final int offsetX = mPaddingLeft - mThumbOffset;
final int offsetY = mPaddingTop;
background.setHotspotBounds(left + offsetX, bounds.top + offsetY,
right + offsetX, bounds.bottom + offsetY);
background.setHotspotBounds(left + offsetX, top + offsetY,
right + offsetX, bottom + offsetY);
}
// Canvas will be translated, so 0,0 is where we start drawing

10
graphics/java/android/graphics/drawable/Ripple.java
View File

@@ -142,14 +142,16 @@ class Ripple {
}
private void clampStartingPosition() {
final float dX = mStartingX - mBounds.exactCenterX();
final float dY = mStartingY - mBounds.exactCenterY();
final float cX = mBounds.exactCenterX();
final float cY = mBounds.exactCenterY();
final float dX = mStartingX - cX;
final float dY = mStartingY - cY;
final float r = mOuterRadius;
if (dX * dX + dY * dY > r * r) {
// Point is outside the circle, clamp to the circumference.
final double angle = Math.atan2(dY, dX);
mClampedStartingX = (float) (Math.cos(angle) * r);
mClampedStartingY = (float) (Math.sin(angle) * r);
mClampedStartingX = cX + (float) (Math.cos(angle) * r);
mClampedStartingY = cY + (float) (Math.sin(angle) * r);
} else {
mClampedStartingX = mStartingX;
mClampedStartingY = mStartingY;