Merge "Fix possible num format exception when logging bubble stack position" into udc-dev am: 4c897660f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22973207 Change-Id: Ida124da89a3fc7ce8a544785975365d2b4db3a4c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -3320,7 +3320,9 @@ public class BubbleStackView extends FrameLayout
|
||||
* @return the normalized x-axis position of the bubble stack rounded to 4 decimal places.
|
||||
*/
|
||||
public float getNormalizedXPosition() {
|
||||
return new BigDecimal(getStackPosition().x / mPositioner.getAvailableRect().width())
|
||||
int width = mPositioner.getAvailableRect().width();
|
||||
float stackPosition = width > 0 ? getStackPosition().x / width : 0;
|
||||
return new BigDecimal(stackPosition)
|
||||
.setScale(4, RoundingMode.CEILING.HALF_UP)
|
||||
.floatValue();
|
||||
}
|
||||
@@ -3329,7 +3331,9 @@ public class BubbleStackView extends FrameLayout
|
||||
* @return the normalized y-axis position of the bubble stack rounded to 4 decimal places.
|
||||
*/
|
||||
public float getNormalizedYPosition() {
|
||||
return new BigDecimal(getStackPosition().y / mPositioner.getAvailableRect().height())
|
||||
int height = mPositioner.getAvailableRect().height();
|
||||
float stackPosition = height > 0 ? getStackPosition().y / height : 0;
|
||||
return new BigDecimal(stackPosition)
|
||||
.setScale(4, RoundingMode.CEILING.HALF_UP)
|
||||
.floatValue();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user