Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 555cd786 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add expandable_use_modifier_implementation flag (1/2)" into main

parents 6ac6b4a1 0401b8fc

packages/SystemUI/aconfig/systemui.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -2117,3 +2117,13 @@ flag { 
      purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "expandable_use_modifier_implementation"

    namespace: "systemui"

    description: "Default the Compose Expandable to the new modifier implementation."

    bug: "428899288"

    metadata {

      purpose: PURPOSE_BUGFIX

    }

}

packages/SystemUI/compose/core/src/com/android/compose/animation/Expandable.kt

+2 −4
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ import androidx.compose.ui.graphics.layer.drawLayer 
import androidx.compose.ui.graphics.rememberGraphicsLayer

import androidx.compose.ui.layout.boundsInRoot

import androidx.compose.ui.layout.findRootCoordinates

import androidx.compose.ui.layout.layout

import androidx.compose.ui.layout.onGloballyPositioned

import androidx.compose.ui.layout.onPlaced

import androidx.compose.ui.node.DrawModifierNode
@@ -85,6 +84,7 @@ import androidx.savedstate.setViewTreeSavedStateRegistryOwner 
import com.android.compose.modifiers.animatedBackground

import com.android.compose.modifiers.thenIf

import com.android.compose.ui.graphics.FullScreenComposeViewInOverlay

import com.android.systemui.Flags.expandableUseModifierImplementation

import com.android.systemui.animation.ComposableControllerFactory

import com.android.systemui.animation.Expandable

import com.android.systemui.animation.TransitionAnimator
@@ -142,9 +142,7 @@ fun Expandable( 
    onClick: ((Expandable) -> Unit)? = null,

    onClickLabel: String? = null,

    interactionSource: MutableInteractionSource? = null,

    // TODO(b/285250939): Default this to true then remove once the Compose QS expandables have

    // proven that the new implementation is robust.

    useModifierBasedImplementation: Boolean = false,

    useModifierBasedImplementation: Boolean = expandableUseModifierImplementation(),

    defaultMinSize: Boolean = true,

    transitionControllerFactory: ComposableControllerFactory? = null,

    content: @Composable (Expandable) -> Unit,