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

Merge "Ensure bounds are updated together." into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-12 16:59:28 +00:00
committed by Android (Google) Code Review
parent 33aae89f29 f31efa38f8
commit a968d33edb
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/transition/ChangeBounds.java
View File

@@ -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;
}
}
}