Skip to content
This repository was archived by the owner on Dec 27, 2024. It is now read-only.

Commit 9859aa1

Browse files
jafu888oscar-ad
authored andcommitted
small fixes
1 parent 9000a7e commit 9859aa1

File tree

3 files changed

+29
-6
lines changed

3 files changed

+29
-6
lines changed

constraintlayout/constraintlayout/src/main/java/androidx/constraintlayout/motion/widget/MotionScene.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public class MotionScene {
8282
private int mLayoutDuringTransition = 0;
8383
public static final int LAYOUT_IGNORE_REQUEST = 0;
8484
public static final int LAYOUT_HONOR_REQUEST = 1;
85-
public static final int LAYOUT_CALL_MEASURE = 3;
85+
public static final int LAYOUT_CALL_MEASURE = 2;
8686

8787
private MotionEvent mLastTouchDown;
8888
private boolean mIgnoreTouch = false;

projects/MotionLayoutVerification/app/src/main/res/layout/verification_801.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,8 @@
329329
app:flow_maxElementsWrap="4"
330330
app:flow_verticalGap="2dp"
331331
app:flow_wrapMode="chain"
332+
android:layout_marginRight="20dp"
333+
android:layout_marginEnd="20dp"
332334
app:layout_constraintBottom_toBottomOf="parent"
333335
app:layout_constraintEnd_toEndOf="parent"
334336
app:layout_constraintStart_toStartOf="parent"

projects/MotionLayoutVerification/app/src/main/res/xml/verification_scene_801.xml

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,48 @@
44
xmlns:motion="http://schemas.android.com/apk/res-auto">
55

66
<Transition
7-
motion:constraintSetEnd="@+id/end"
7+
motion:constraintSetEnd="@+id/a"
88
motion:constraintSetStart="@id/start"
9-
motion:layoutDuringTransition="honorRequest"
9+
motion:layoutDuringTransition="callMeasure"
1010
motion:duration="1000">
1111
<KeyFrameSet>
1212
</KeyFrameSet>
13-
<OnSwipe motion:touchAnchorId="@+id/flow9" />
13+
<OnSwipe motion:dragDirection="dragUp" />
1414
</Transition>
1515

16+
<Transition
17+
motion:constraintSetEnd="@+id/b"
18+
motion:constraintSetStart="@id/start"
19+
motion:layoutDuringTransition="honorRequest"
20+
motion:pathMotionArc="startVertical"
21+
motion:duration="1000">
22+
<KeyFrameSet>
23+
</KeyFrameSet>
24+
<OnSwipe motion:dragDirection="dragDown" />
25+
</Transition>
1626
<ConstraintSet android:id="@+id/start">
1727
</ConstraintSet>
1828

19-
<ConstraintSet android:id="@+id/end">
29+
<ConstraintSet android:id="@+id/a">
2030
<Constraint
2131
motion:layout_constraintEnd_toEndOf="parent"
2232
android:layout_width="0dp"
2333
android:layout_height="wrap_content"
24-
motion:layout_constraintBottom_toBottomOf="parent"
34+
2535
motion:layout_constraintTop_toTopOf="parent"
2636
motion:layout_constraintStart_toStartOf="parent"
2737
android:id="@+id/flow9" />
2838
<ConstraintOverride android:id="@+id/button21" android:layout_width="150dp"/>
2939
</ConstraintSet>
40+
<ConstraintSet android:id="@+id/b">
41+
<Constraint
42+
motion:layout_constraintEnd_toEndOf="parent"
43+
android:layout_width="0dp"
44+
android:layout_height="wrap_content"
45+
motion:layout_constraintBottom_toBottomOf="parent"
46+
47+
motion:layout_constraintStart_toStartOf="parent"
48+
android:id="@+id/flow9" />
49+
<ConstraintOverride android:id="@+id/button21" android:layout_width="150dp"/>
50+
</ConstraintSet>
3051
</MotionScene>

0 commit comments

Comments
 (0)