perf check

constraintlayout/constraintlayout/src/main/java/androidx/constraintlayout/widget/ConstraintLayout.java

@@ -567,7 +567,6 @@ public class ConstraintLayout extends ViewGroup {
     private static final boolean USE_CONSTRAINTS_HELPER = true;
     private static final boolean DEBUG = LinearSystem.FULL_DEBUG;
     private static final boolean DEBUG_DRAW_CONSTRAINTS = false;
-    private static final boolean MEASURE = false;
     private static final boolean OPTIMIZE_HEIGHT_CHANGE = false;
 
     SparseArray<View> mChildrenByIds = new SparseArray<>();
@@ -741,10 +740,11 @@ public final void measure(ConstraintWidget widget,
                 return;
             }
 
-            long startMeasure;
+            long startMeasure = 0;
             long endMeasure;
 
-            if (MEASURE) {
+            if (mMetrics != null) {
+                mMetrics.mNumberOfMeasures++;
                 startMeasure = System.nanoTime();
             }
 
@@ -1008,11 +1008,9 @@ && isSimilarSpec(widget.getLastVerticalMeasureSpec(),
             measure.measuredHeight = height;
             measure.measuredHasBaseline = hasBaseline;
             measure.measuredBaseline = baseline;
-            if (MEASURE) {
+            if (mMetrics != null) {
                 endMeasure = System.nanoTime();
-                if (mMetrics != null) {
-                    mMetrics.measuresWidgetsDuration += (endMeasure - startMeasure);
-                }
+                mMetrics.measuresWidgetsDuration += (endMeasure - startMeasure);
             }
         }
 
@@ -1736,6 +1734,7 @@ protected void resolveSystem(ConstraintWidgetContainer layout,
         heightSize -= paddingHeight;
 
         setSelfDimensionBehaviour(layout, widthMode, widthSize, heightMode, heightSize);
+
         layout.measure(optimizationLevel, widthMode, widthSize, heightMode, heightSize,
                 mLastMeasureWidth, mLastMeasureHeight, paddingX, paddingY);
     }
@@ -1788,8 +1787,10 @@ protected void resolveMeasuredDimension(int widthMeasureSpec,
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         long time = 0;
-        if (DEBUG) {
-            time = System.currentTimeMillis();
+        if (mMetrics != null) {
+            time = System.nanoTime();
+            mMetrics.mChildCount = getChildCount();
+            mMetrics.mMeasureCalls++;
         }
         mDirtyHierarchy |= dynamicUpdateConstraints(widthMeasureSpec,  heightMeasureSpec);
 
@@ -1827,6 +1828,9 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
                         mLayoutWidget.getWidth(), mLayoutWidget.getHeight(),
                         mLayoutWidget.isWidthMeasuredTooSmall(),
                         mLayoutWidget.isHeightMeasuredTooSmall());
+                if (mMetrics != null) {
+                    mMetrics.mMeasureDuration +=  System.nanoTime() - time;
+                }
                 return;
             }
             if (OPTIMIZE_HEIGHT_CHANGE
@@ -1847,6 +1851,9 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
                             mLayoutWidget.getWidth(), mLayoutWidget.getHeight(),
                             mLayoutWidget.isWidthMeasuredTooSmall(),
                             mLayoutWidget.isHeightMeasuredTooSmall());
+                    if (mMetrics != null) {
+                        mMetrics.mMeasureDuration +=  System.nanoTime() - time;
+                    }
                     return;
                 }
             }
@@ -1869,14 +1876,18 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
                 mLayoutWidget.updateHierarchy();
             }
         }
+        mLayoutWidget.fillMetrics(mMetrics);
 
         resolveSystem(mLayoutWidget, mOptimizationLevel, widthMeasureSpec, heightMeasureSpec);
         resolveMeasuredDimension(widthMeasureSpec, heightMeasureSpec,
                 mLayoutWidget.getWidth(), mLayoutWidget.getHeight(),
                 mLayoutWidget.isWidthMeasuredTooSmall(), mLayoutWidget.isHeightMeasuredTooSmall());
 
+        if (mMetrics != null) {
+            mMetrics.mMeasureDuration +=  System.nanoTime() - time;
+        }
         if (DEBUG) {
-            time = System.currentTimeMillis() - time;
+            time = System.nanoTime() - time;
             System.out.println(mLayoutWidget.getDebugName() + " (" + getChildCount()
                     + ") DONE onMeasure width: " + MeasureSpec.toString(widthMeasureSpec)
                     + " height: " + MeasureSpec.toString(heightMeasureSpec) + " => "
@@ -2008,6 +2019,9 @@ public void setState(int id, int screenWidth, int screenHeight) {
      */
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        if (mMetrics != null) {
+            mMetrics.mNumberOfLayouts++;
+        }
         if (DEBUG) {
             System.out.println(mLayoutWidget.getDebugName() + " onLayout changed: "
                     + changed + " left: " + left + " top: " + top