Fix presubmit issues

androidx · Sep 21, 2022 · b8993a3 · b8993a3
1 parent 981d408
commit b8993a3
Show file tree

Hide file tree

Showing 12 changed files with 67 additions and 41 deletions.
diff --git a/constraintlayout/compose/src/androidTest/java/androidx/constraintlayout/compose/FlowTest.kt b/constraintlayout/compose/src/androidTest/java/androidx/constraintlayout/compose/FlowTest.kt
@@ -239,7 +239,7 @@ private fun FlowComposableTest(
         constraintSet = ConstraintSet(
             """
         {
-            flow1: { 
+            flow1: {
                 width: $width,
                 height: $height,
                 type: '$type',

diff --git a/...ntlayout/compose/src/androidTest/java/androidx/constraintlayout/compose/MotionFlowTest.kt b/...ntlayout/compose/src/androidTest/java/androidx/constraintlayout/compose/MotionFlowTest.kt
@@ -73,7 +73,7 @@ class MotionFlowTest {
             {
                 ConstraintSets: {
                   start: {
-                    flow1: { 
+                    flow1: {
                         width: 'parent',
                         height: 'parent',
                         type: 'hFlow',
@@ -83,9 +83,8 @@ class MotionFlowTest {
                         contains: ['1', '2', '3', '4'],
                       }
                   },
-                  
                   end: {
-                    flow2: { 
+                    flow2: {
                         width: 'parent',
                         height: 'parent',
                         type: 'vFlow',
@@ -96,7 +95,6 @@ class MotionFlowTest {
                       }
                   }
                 },
-                
                 Transitions: {
                   default: {
                     from: 'start',   to: 'end',

diff --git a/constraintlayout/compose/src/main/java/androidx/constraintlayout/compose/Motion.kt b/constraintlayout/compose/src/main/java/androidx/constraintlayout/compose/Motion.kt
@@ -68,7 +68,7 @@ import kotlinx.coroutines.launch
  * Use [rememberMotionContent] and [MotionScope.motion] to animate layout changes caused by changing
  * the Composable's Layout parent on state changes.
  *
- * E.g:
+ * E.g.:
  *
  * ```
  * var vertOrHor by remember { mutableStateOf(false) }
@@ -225,7 +225,7 @@ class MotionScope(
                 update(endWidget, 1)
             }
         }
-        // TODO: Optimize all animated items at a time under a single Animatable. E.g: If after
+        // TODO: Optimize all animated items at a time under a single Animatable. E.g.: If after
         //  a state change, 10 different items changed, animate them using one Animatable
         //  object, as opposed to running 10 separate Animatables doing the same thing,
         //  measure/layout calls in the LookAheadLayout MeasurePolicy might provide the clue to

diff --git a/constraintlayout/compose/src/main/java/androidx/constraintlayout/compose/MotionCarousel.kt b/constraintlayout/compose/src/main/java/androidx/constraintlayout/compose/MotionCarousel.kt
@@ -151,7 +151,9 @@ import androidx.constraintlayout.compose.carousel.carouselSwipeable
  */
 @OptIn(ExperimentalMotionApi::class)
 @Composable
+@Suppress("UnavailableSymbol")
 fun MotionCarousel(
+    @Suppress("HiddenTypeParameter")
     motionScene: MotionScene,
     initialSlotIndex: Int,
     numSlots: Int,
@@ -238,7 +240,7 @@ fun MotionCarousel(
     MotionLayout(motionScene = motionScene,
         transitionName = transitionName.value,
         progress = mprogress,
-        motionLayoutFlags = MotionLayoutFlags.FullMeasure, // TODO: only apply as needed
+        motionLayoutFlags = setOf(MotionLayoutFlag.FullMeasure), // TODO: only apply as needed
         modifier = Modifier
             .fillMaxSize()
             .background(Color.White)
@@ -319,8 +321,10 @@ interface MotionCarouselScope {
     )
 
     @OptIn(ExperimentalMotionApi::class)
+    @Suppress("UnavailableSymbol")
     fun itemsWithProperties(
         count: Int,
+        @Suppress("HiddenTypeParameter")
         itemContent: @Composable (
             index: Int,
             properties: androidx.compose.runtime.State<MotionProperties>
@@ -329,8 +333,10 @@ interface MotionCarouselScope {
 }
 
 @OptIn(ExperimentalMotionApi::class)
+@Suppress("UnavailableSymbol")
 inline fun <T> MotionCarouselScope.itemsWithProperties(
     items: List<T>,
+    @Suppress("HiddenTypeParameter")
     crossinline itemContent: @Composable (
         item: T,
         properties: androidx.compose.runtime.State<MotionProperties>
@@ -351,9 +357,12 @@ private fun rememberStateOfItemsProvider(
 
 @OptIn(ExperimentalMotionApi::class)
 interface MotionItemsProvider {
+    @SuppressWarnings("UnavailableSymbol")
     fun getContent(index: Int): @Composable() () -> Unit
+    @SuppressWarnings("UnavailableSymbol")
     fun getContent(
         index: Int,
+        @SuppressWarnings("HiddenTypeParameter")
         properties: androidx.compose.runtime.State<MotionProperties>
     ): @Composable() () -> Unit
 

diff --git a/constraintlayout/compose/src/main/java/androidx/constraintlayout/compose/MotionLayout.kt b/constraintlayout/compose/src/main/java/androidx/constraintlayout/compose/MotionLayout.kt
@@ -51,7 +51,7 @@ import kotlinx.coroutines.launch
 /**
  * Measure flags for MotionLayout
  */
-enum class MotionLayoutFlags(value: Long) {
+enum class MotionLayoutFlag(@Suppress("UNUSED_PARAMETER") value: Long) {
     Default(0),
     FullMeasure(1)
 }
@@ -71,7 +71,7 @@ inline fun MotionLayout(
     progress: Float,
     debug: EnumSet<MotionLayoutDebugFlags> = EnumSet.of(MotionLayoutDebugFlags.NONE),
     optimizationLevel: Int = Optimizer.OPTIMIZATION_STANDARD,
-    motionLayoutFlags: MotionLayoutFlags = MotionLayoutFlags.Default,
+    motionLayoutFlags: Set<MotionLayoutFlag> = setOf<MotionLayoutFlag>(),
     crossinline content: @Composable MotionLayoutScope.() -> Unit
 ) {
     val motionProgress = createAndUpdateMotionProgress(progress = progress)
@@ -103,7 +103,7 @@ inline fun MotionLayout(
     transitionName: String = "default",
     debug: EnumSet<MotionLayoutDebugFlags> = EnumSet.of(MotionLayoutDebugFlags.NONE),
     optimizationLevel: Int = Optimizer.OPTIMIZATION_STANDARD,
-    motionLayoutFlags: MotionLayoutFlags = MotionLayoutFlags.Default,
+    motionLayoutFlags: Set<MotionLayoutFlag> = setOf<MotionLayoutFlag>(),
     crossinline content: @Composable (MotionLayoutScope.() -> Unit),
 ) {
     MotionLayoutCore(
@@ -139,7 +139,7 @@ inline fun MotionLayout(
     animationSpec: AnimationSpec<Float> = tween(),
     debug: EnumSet<MotionLayoutDebugFlags> = EnumSet.of(MotionLayoutDebugFlags.NONE),
     optimizationLevel: Int = Optimizer.OPTIMIZATION_STANDARD,
-    motionLayoutFlags: MotionLayoutFlags = MotionLayoutFlags.Default,
+    motionLayoutFlags: Set<MotionLayoutFlag> = setOf<MotionLayoutFlag>(),
     noinline finishedAnimationListener: (() -> Unit)? = null,
     crossinline content: @Composable (MotionLayoutScope.() -> Unit)
 ) {
@@ -168,7 +168,7 @@ inline fun MotionLayout(
     debug: EnumSet<MotionLayoutDebugFlags> = EnumSet.of(MotionLayoutDebugFlags.NONE),
     informationReceiver: LayoutInformationReceiver? = null,
     optimizationLevel: Int = Optimizer.OPTIMIZATION_STANDARD,
-    motionLayoutFlags: MotionLayoutFlags = MotionLayoutFlags.Default,
+    motionLayoutFlags: Set<MotionLayoutFlag> = setOf<MotionLayoutFlag>(),
     crossinline content: @Composable (MotionLayoutScope.() -> Unit)
 ) {
     val motionProgress = createAndUpdateMotionProgress(progress = progress)
@@ -189,15 +189,18 @@ inline fun MotionLayout(
 @ExperimentalMotionApi
 @PublishedApi
 @Composable
+@Suppress("UnavailableSymbol")
 internal inline fun MotionLayoutCore(
+    @Suppress("HiddenTypeParameter")
     motionScene: MotionScene,
     modifier: Modifier = Modifier,
     constraintSetName: String? = null,
     animationSpec: AnimationSpec<Float> = tween(),
     debugFlag: MotionLayoutDebugFlags = MotionLayoutDebugFlags.NONE,
     optimizationLevel: Int = Optimizer.OPTIMIZATION_STANDARD,
-    motionLayoutFlags: MotionLayoutFlags = MotionLayoutFlags.Default,
+    motionLayoutFlags: Set<MotionLayoutFlag> = setOf<MotionLayoutFlag>(),
     noinline finishedAnimationListener: (() -> Unit)? = null,
+    @Suppress("HiddenTypeParameter")
     crossinline content: @Composable (MotionLayoutScope.() -> Unit)
 ) {
     val needsUpdate = remember {
@@ -285,14 +288,17 @@ internal inline fun MotionLayoutCore(
 @ExperimentalMotionApi
 @PublishedApi
 @Composable
+@Suppress("UnavailableSymbol")
 internal inline fun MotionLayoutCore(
+    @Suppress("HiddenTypeParameter")
     motionScene: MotionScene,
     progress: Float,
     modifier: Modifier = Modifier,
     debug: EnumSet<MotionLayoutDebugFlags> = EnumSet.of(MotionLayoutDebugFlags.NONE),
     optimizationLevel: Int = Optimizer.OPTIMIZATION_STANDARD,
     transitionName: String,
-    motionLayoutFlags: MotionLayoutFlags = MotionLayoutFlags.Default,
+    motionLayoutFlags: Set<MotionLayoutFlag> = setOf<MotionLayoutFlag>(),
+    @Suppress("HiddenTypeParameter")
     crossinline content: @Composable MotionLayoutScope.() -> Unit,
 ) {
     val transition = remember(motionScene, transitionName) {
@@ -328,6 +334,7 @@ internal inline fun MotionLayoutCore(
 @ExperimentalMotionApi
 @PublishedApi
 @Composable
+@Suppress("UnavailableSymbol")
 internal inline fun MotionLayoutCore(
     start: ConstraintSet,
     end: ConstraintSet,
@@ -337,7 +344,8 @@ internal inline fun MotionLayoutCore(
     debugFlag: MotionLayoutDebugFlags = MotionLayoutDebugFlags.NONE,
     informationReceiver: LayoutInformationReceiver? = null,
     optimizationLevel: Int = Optimizer.OPTIMIZATION_STANDARD,
-    motionLayoutFlags: MotionLayoutFlags = MotionLayoutFlags.Default,
+    motionLayoutFlags: Set<MotionLayoutFlag> = setOf<MotionLayoutFlag>(),
+    @Suppress("HiddenTypeParameter")
     crossinline content: @Composable MotionLayoutScope.() -> Unit
 ) {
     // TODO: Merge this snippet with UpdateWithForcedIfNoUserChange
@@ -422,12 +430,15 @@ inline fun MotionLayout(
 @PublishedApi
 @ExperimentalMotionApi
 @Composable
+@Suppress("UnavailableSymbol")
 internal inline fun MotionLayoutCore(
     modifier: Modifier = Modifier,
     optimizationLevel: Int = Optimizer.OPTIMIZATION_STANDARD,
     motionLayoutState: MotionLayoutStateImpl,
+    @Suppress("HiddenTypeParameter")
     motionScene: MotionScene,
     transitionName: String = "default",
+    @Suppress("HiddenTypeParameter")
     crossinline content: @Composable MotionLayoutScope.() -> Unit
 ) {
     val transition = remember(motionScene, transitionName) {
@@ -460,10 +471,10 @@ internal inline fun MotionLayoutCore(
     )
 }
 
-@Suppress("unused")
 @LayoutScopeMarker
 @ExperimentalMotionApi
-class MotionLayoutScope @PublishedApi internal constructor(
+class MotionLayoutScope @Suppress("ShowingMemberInHiddenClass")
+    @PublishedApi internal constructor(
     private val measurer: MotionMeasurer,
     private val motionProgress: MotionProgress
 ) {
@@ -554,7 +565,7 @@ internal fun rememberMotionLayoutMeasurePolicy(
     constraintSetEnd: ConstraintSet,
     @SuppressWarnings("HiddenTypeParameter") transition: TransitionImpl?,
     motionProgress: MotionProgress,
-    motionLayoutFlags: MotionLayoutFlags = MotionLayoutFlags.Default,
+    motionLayoutFlags: Set<MotionLayoutFlag> = setOf<MotionLayoutFlag>(),
     measurer: MotionMeasurer
 ): MeasurePolicy {
     val density = LocalDensity.current

diff --git a/constraintlayout/compose/src/main/java/androidx/constraintlayout/compose/MotionMeasurer.kt b/constraintlayout/compose/src/main/java/androidx/constraintlayout/compose/MotionMeasurer.kt
@@ -77,6 +77,7 @@ internal class MotionMeasurer : Measurer() {
         root.measure(Optimizer.OPTIMIZATION_NONE, 0, 0, 0, 0, 0, 0, 0, 0)
     }
 
+    @Suppress("UnavailableSymbol")
     fun performInterpolationMeasure(
         constraints: Constraints,
         layoutDirection: LayoutDirection,
@@ -86,16 +87,17 @@ internal class MotionMeasurer : Measurer() {
         measurables: List<Measurable>,
         optimizationLevel: Int,
         progress: Float,
-        motionLayoutFlags: MotionLayoutFlags = MotionLayoutFlags.Default,
+        motionLayoutFlags: Set<MotionLayoutFlag> = setOf<MotionLayoutFlag>(),
         measureScope: MeasureScope
     ): IntSize {
         this.density = measureScope
         this.measureScope = measureScope
 
         var needsRemeasure = false
-        if (motionLayoutFlags == MotionLayoutFlags.Default) {
+        var flag = motionLayoutFlags.firstOrNull()
+        if (flag == MotionLayoutFlag.Default || flag == null) {
             needsRemeasure = needsRemeasure(constraints)
-        } else if (motionLayoutFlags == MotionLayoutFlags.FullMeasure) {
+        } else if (flag == MotionLayoutFlag.FullMeasure) {
             needsRemeasure = true
         }
 
@@ -511,6 +513,7 @@ internal class MotionMeasurer : Measurer() {
         frameCache.clear()
     }
 
+    @Suppress("UnavailableSymbol")
     fun initWith(
         start: ConstraintSet,
         end: ConstraintSet,

diff --git a/constraintlayout/compose/src/main/java/androidx/constraintlayout/compose/MotionSceneScope.kt b/constraintlayout/compose/src/main/java/androidx/constraintlayout/compose/MotionSceneScope.kt
@@ -97,15 +97,15 @@ internal class MotionSceneDslImpl(
 /**
  * Scope used by the MotionScene DSL.
  *
- * &nbsp
+ * &nbsp;
  *
  * Define new [ConstraintSet]s and [Transition]s within this scope using [constraintSet] and
  * [transition] respectively.
  *
  * Alternatively, you may add existing objects to this scope using [addConstraintSet] and
  * [addTransition].
  *
- * &nbsp
+ * &nbsp;
  *
  * The [defaultTransition] **should always be set**. It defines the initial state of the layout and
  * works as a fallback for undefined `from -> to` transitions.

diff --git a/...aintlayout/src/main/java/androidx/constraintlayout/widget/ConstraintLayoutStatistics.java b/...aintlayout/src/main/java/androidx/constraintlayout/widget/ConstraintLayoutStatistics.java
@@ -95,6 +95,7 @@ public void reset() {
      * Create a copy of the statistics
      * @return a copy
      */
+    @Override
     public ConstraintLayoutStatistics clone() {
         return new ConstraintLayoutStatistics(this);
     }
@@ -122,10 +123,10 @@ public void logSummary(String tag) {
 
     @SuppressLint({"LogConditional"})
     private void log(String tag) {
-        String value;
         StackTraceElement s = new Throwable().getStackTrace()[2];
 
-        Log.v(tag, "CL Perf: --------  Performance .(" + s.getFileName() + ":" + s.getLineNumber() + ")  ------ ");
+        Log.v(tag, "CL Perf: --------  Performance .(" +
+                s.getFileName() + ":" + s.getLineNumber() + ")  ------ ");
 
         DecimalFormat df = new DecimalFormat("###.000");
 
@@ -172,7 +173,8 @@ private String log(int param) {
     }
 
     /**
-     * Generate a float formatted String for the parameter comparing current value with value in relative
+     * Generate a float formatted String for the parameter comparing
+     * current value with value in relative
      * @param df Format the float using this
      * @param relative compare against
      * @param param the parameter to compare
@@ -218,7 +220,8 @@ public void logSummary(String tag, ConstraintLayoutStatistics prev) {
         DecimalFormat df = new DecimalFormat("###.000");
         StackTraceElement s = new Throwable().getStackTrace()[1];
 
-        Log.v(tag, "CL Perf: -=  Performance .(" + s.getFileName() + ":" + s.getLineNumber() + ")  =- ");
+        Log.v(tag, "CL Perf: -=  Performance .(" +
+                s.getFileName() + ":" + s.getLineNumber() + ")  =- ");
         Log.v(tag, compare(df, prev, DURATION_OF_CHILD_MEASURES));
         Log.v(tag, compare(df, prev, DURATION_OF_LAYOUT));
         Log.v(tag, compare(df, prev, DURATION_OF_MEASURES));

diff --git a/constraintlayout/core/src/main/java/androidx/constraintlayout/core/Metrics.java b/constraintlayout/core/src/main/java/androidx/constraintlayout/core/Metrics.java
@@ -171,5 +171,4 @@ public void copy(Metrics metrics) {
         resolvedWidgets = metrics.resolvedWidgets;
         nonresolvedWidgets = metrics.nonresolvedWidgets;
     }
-
 }
diff --git a/...ntlayout/core/src/main/java/androidx/constraintlayout/core/state/ConstraintSetParser.java b/...ntlayout/core/src/main/java/androidx/constraintlayout/core/state/ConstraintSetParser.java
@@ -1099,13 +1099,14 @@ private static void parseFlowType(String flowType,
                         vStyleValueStr = vStyleObject.content();
                     }
 
-                    if (vStyleValueStr != "") {
+                    if (!vStyleValueStr.equals("")) {
                         flow.setVerticalStyle(State.Chain.getValueByString(vStyleValueStr));
                     }
-                    if (vFirstStyleValueStr != "") {
-                        flow.setFirstVerticalStyle(State.Chain.getValueByString(vFirstStyleValueStr));
+                    if (!vFirstStyleValueStr.equals("")) {
+                        flow.setFirstVerticalStyle(
+                                State.Chain.getValueByString(vFirstStyleValueStr));
                     }
-                    if (vLastStyleValueStr != "") {
+                    if (!vLastStyleValueStr.equals("")) {
                         flow.setLastVerticalStyle(State.Chain.getValueByString(vLastStyleValueStr));
                     }
                     break;
@@ -1124,14 +1125,16 @@ private static void parseFlowType(String flowType,
                         hStyleValueStr = hStyleObject.content();
                     }
 
-                    if (hStyleValueStr != "") {
+                    if (!hStyleValueStr.equals("")) {
                         flow.setHorizontalStyle(State.Chain.getValueByString(hStyleValueStr));
                     }
-                    if (hFirstStyleValueStr != "") {
-                        flow.setFirstHorizontalStyle(State.Chain.getValueByString(hFirstStyleValueStr));
+                    if (!hFirstStyleValueStr.equals("")) {
+                        flow.setFirstHorizontalStyle(
+                                State.Chain.getValueByString(hFirstStyleValueStr));
                     }
-                    if (hLastStyleValueStr != "") {
-                        flow.setLastHorizontalStyle(State.Chain.getValueByString(hLastStyleValueStr));
+                    if (!hLastStyleValueStr.equals("")) {
+                        flow.setLastHorizontalStyle(
+                                State.Chain.getValueByString(hLastStyleValueStr));
                     }
                     break;
                 default:
@@ -1408,7 +1411,6 @@ static void parseWidget(
             ConstraintReference reference,
             CLObject element
     ) throws CLParsingException {
-        float value;
         if (reference.getWidth() == null) {
             // Default to Wrap when the Dimension has not been assigned
             reference.setWidth(Dimension.createWrap());