From 9859aa1615a157d9ae1fc24c51639de1c6557db1 Mon Sep 17 00:00:00 2001
From: jafu888 <hoford@google.com>
Date: Thu, 11 Nov 2021 13:31:15 -0800
Subject: [PATCH] small fixes

---
 .../motion/widget/MotionScene.java            |  2 +-
 .../src/main/res/layout/verification_801.xml  |  2 ++
 .../main/res/xml/verification_scene_801.xml   | 31 ++++++++++++++++---
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/constraintlayout/constraintlayout/src/main/java/androidx/constraintlayout/motion/widget/MotionScene.java b/constraintlayout/constraintlayout/src/main/java/androidx/constraintlayout/motion/widget/MotionScene.java
index 974b69273..6bf4eb194 100644
--- a/constraintlayout/constraintlayout/src/main/java/androidx/constraintlayout/motion/widget/MotionScene.java
+++ b/constraintlayout/constraintlayout/src/main/java/androidx/constraintlayout/motion/widget/MotionScene.java
@@ -82,7 +82,7 @@ public class MotionScene {
     private int mLayoutDuringTransition = 0;
     public static final int LAYOUT_IGNORE_REQUEST = 0;
     public static final int LAYOUT_HONOR_REQUEST = 1;
-    public static final int LAYOUT_CALL_MEASURE = 3;
+    public static final int LAYOUT_CALL_MEASURE = 2;
 
     private MotionEvent mLastTouchDown;
     private boolean mIgnoreTouch = false;
diff --git a/projects/MotionLayoutVerification/app/src/main/res/layout/verification_801.xml b/projects/MotionLayoutVerification/app/src/main/res/layout/verification_801.xml
index e4a405f86..d75721b83 100644
--- a/projects/MotionLayoutVerification/app/src/main/res/layout/verification_801.xml
+++ b/projects/MotionLayoutVerification/app/src/main/res/layout/verification_801.xml
@@ -329,6 +329,8 @@
         app:flow_maxElementsWrap="4"
         app:flow_verticalGap="2dp"
         app:flow_wrapMode="chain"
+        android:layout_marginRight="20dp"
+        android:layout_marginEnd="20dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/projects/MotionLayoutVerification/app/src/main/res/xml/verification_scene_801.xml b/projects/MotionLayoutVerification/app/src/main/res/xml/verification_scene_801.xml
index 8a7b43575..254b034db 100644
--- a/projects/MotionLayoutVerification/app/src/main/res/xml/verification_scene_801.xml
+++ b/projects/MotionLayoutVerification/app/src/main/res/xml/verification_scene_801.xml
@@ -4,27 +4,48 @@
     xmlns:motion="http://schemas.android.com/apk/res-auto">
 
     <Transition
-        motion:constraintSetEnd="@+id/end"
+        motion:constraintSetEnd="@+id/a"
         motion:constraintSetStart="@id/start"
-        motion:layoutDuringTransition="honorRequest"
+        motion:layoutDuringTransition="callMeasure"
         motion:duration="1000">
        <KeyFrameSet>
        </KeyFrameSet>
-        <OnSwipe motion:touchAnchorId="@+id/flow9" />
+        <OnSwipe motion:dragDirection="dragUp" />
     </Transition>
 
+    <Transition
+        motion:constraintSetEnd="@+id/b"
+        motion:constraintSetStart="@id/start"
+        motion:layoutDuringTransition="honorRequest"
+        motion:pathMotionArc="startVertical"
+        motion:duration="1000">
+        <KeyFrameSet>
+        </KeyFrameSet>
+        <OnSwipe motion:dragDirection="dragDown" />
+    </Transition>
     <ConstraintSet android:id="@+id/start">
     </ConstraintSet>
 
-    <ConstraintSet android:id="@+id/end">
+    <ConstraintSet android:id="@+id/a">
         <Constraint
             motion:layout_constraintEnd_toEndOf="parent"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            motion:layout_constraintBottom_toBottomOf="parent"
+
             motion:layout_constraintTop_toTopOf="parent"
             motion:layout_constraintStart_toStartOf="parent"
             android:id="@+id/flow9" />
         <ConstraintOverride android:id="@+id/button21" android:layout_width="150dp"/>
     </ConstraintSet>
+    <ConstraintSet android:id="@+id/b">
+        <Constraint
+            motion:layout_constraintEnd_toEndOf="parent"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            motion:layout_constraintBottom_toBottomOf="parent"
+
+            motion:layout_constraintStart_toStartOf="parent"
+            android:id="@+id/flow9" />
+        <ConstraintOverride android:id="@+id/button21" android:layout_width="150dp"/>
+    </ConstraintSet>
 </MotionScene>
\ No newline at end of file