summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/transition/ChangeBounds.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/core/java/android/transition/ChangeBounds.java b/core/java/android/transition/ChangeBounds.java
index b6d8aa449533..546f93a2e97a 100644
--- a/core/java/android/transition/ChangeBounds.java
+++ b/core/java/android/transition/ChangeBounds.java
@@ -472,9 +472,9 @@ public class ChangeBounds extends Transition {
private int mTop;
private int mRight;
private int mBottom;
- private boolean mIsTopLeftSet;
- private boolean mIsBottomRightSet;
private View mView;
+ private int mTopLeftCalls;
+ private int mBottomRightCalls;
public ViewBounds(View view) {
mView = view;
@@ -483,8 +483,8 @@ public class ChangeBounds extends Transition {
public void setTopLeft(PointF topLeft) {
mLeft = Math.round(topLeft.x);
mTop = Math.round(topLeft.y);
- mIsTopLeftSet = true;
- if (mIsBottomRightSet) {
+ mTopLeftCalls++;
+ if (mTopLeftCalls == mBottomRightCalls) {
setLeftTopRightBottom();
}
}
@@ -492,16 +492,16 @@ public class ChangeBounds extends Transition {
public void setBottomRight(PointF bottomRight) {
mRight = Math.round(bottomRight.x);
mBottom = Math.round(bottomRight.y);
- mIsBottomRightSet = true;
- if (mIsTopLeftSet) {
+ mBottomRightCalls++;
+ if (mTopLeftCalls == mBottomRightCalls) {
setLeftTopRightBottom();
}
}
private void setLeftTopRightBottom() {
mView.setLeftTopRightBottom(mLeft, mTop, mRight, mBottom);
- mIsTopLeftSet = false;
- mIsBottomRightSet = false;
+ mTopLeftCalls = 0;
+ mBottomRightCalls = 0;
}
}
}