diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-03-15 01:02:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-15 01:02:40 +0000 |
| commit | 380cabf6fb42fc013819f2bf6ab97382ca3f7889 (patch) | |
| tree | 110eb6fa21356199ece5e9c1f068f4f16190ac21 | |
| parent | b8a107018b5b641b4dacfbe343b315c92b4beae3 (diff) | |
| parent | 55b561fde47e616c49ab3b93af59bf88d535cbee (diff) | |
| download | sherpa-380cabf6fb42fc013819f2bf6ab97382ca3f7889.tar.gz | |
Merge "Bump barriers strength to equality" into studio-master-dev
| -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); } } } |