diff options
| author | Nicolas Roard <nicolasroard@google.com> | 2018-03-14 17:36:34 -0700 |
|---|---|---|
| committer | Nicolas Roard <nicolasroard@google.com> | 2018-03-14 17:39:30 -0700 |
| commit | 55b561fde47e616c49ab3b93af59bf88d535cbee (patch) | |
| tree | fdf04cce5a92e346786ad2162d1eaa2aefef9686 | |
| parent | dec4f65920329cfac77d32db35d141acc43f9355 (diff) | |
| download | sherpa-55b561fde47e616c49ab3b93af59bf88d535cbee.tar.gz | |
Bump barriers strength to equality
Test: added check162 in sherpa, other tests passing.
Change-Id: I6e0db0a5eeab38f6eb2096118d701d32de92b4da
Fixes: 74469361
| -rw-r--r-- | solver/src/main/java/android/support/constraint/solver/widgets/Barrier.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/solver/src/main/java/android/support/constraint/solver/widgets/Barrier.java b/solver/src/main/java/android/support/constraint/solver/widgets/Barrier.java index 93a7b51..b5a07b2 100644 --- a/solver/src/main/java/android/support/constraint/solver/widgets/Barrier.java +++ b/solver/src/main/java/android/support/constraint/solver/widgets/Barrier.java @@ -106,22 +106,22 @@ public class Barrier extends Helper { if (mBarrierType == LEFT) { system.addEquality(mRight.mSolverVariable, mLeft.mSolverVariable, 0, SolverVariable.STRENGTH_FIXED); if (!hasMatchConstraintWidgets) { - system.addEquality(mLeft.mSolverVariable, mParent.mRight.mSolverVariable, 0, SolverVariable.STRENGTH_HIGHEST); + system.addEquality(mLeft.mSolverVariable, mParent.mRight.mSolverVariable, 0, SolverVariable.STRENGTH_EQUALITY); } } else if (mBarrierType == RIGHT) { system.addEquality(mLeft.mSolverVariable, mRight.mSolverVariable, 0, SolverVariable.STRENGTH_FIXED); if (!hasMatchConstraintWidgets) { - system.addEquality(mLeft.mSolverVariable, mParent.mLeft.mSolverVariable, 0, SolverVariable.STRENGTH_HIGHEST); + system.addEquality(mLeft.mSolverVariable, mParent.mLeft.mSolverVariable, 0, SolverVariable.STRENGTH_EQUALITY); } } else if (mBarrierType == TOP) { system.addEquality(mBottom.mSolverVariable, mTop.mSolverVariable, 0, SolverVariable.STRENGTH_FIXED); if (!hasMatchConstraintWidgets) { - system.addEquality(mTop.mSolverVariable, mParent.mBottom.mSolverVariable, 0, SolverVariable.STRENGTH_HIGHEST); + system.addEquality(mTop.mSolverVariable, mParent.mBottom.mSolverVariable, 0, SolverVariable.STRENGTH_EQUALITY); } } else if (mBarrierType == BOTTOM) { system.addEquality(mTop.mSolverVariable, mBottom.mSolverVariable, 0, SolverVariable.STRENGTH_FIXED); if (!hasMatchConstraintWidgets) { - system.addEquality(mTop.mSolverVariable, mParent.mTop.mSolverVariable, 0, SolverVariable.STRENGTH_HIGHEST); + system.addEquality(mTop.mSolverVariable, mParent.mTop.mSolverVariable, 0, SolverVariable.STRENGTH_EQUALITY); } } } |