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

Commit 67d8f970 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Rename (Element|Scene|Value)Key.name to .debugName

Bug: 308961608
Test: atest PlatformComposeSceneTransitionLayoutTests
Flag: N/A
Change-Id: I16a69a1858815a737b46314d844627dc6c9468c1
parent 3c521f2e
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ fun SceneKey.toCommunalSceneKey(): CommunalSceneKey {

// TODO(b/315490861): Remove these conversions once Compose can be used throughout SysUI.
fun CommunalSceneKey.toTransitionSceneKey(): SceneKey {
    return SceneKey(name = toString(), identity = this)
    return SceneKey(debugName = toString(), identity = this)
}

/**
+1 −1
Original line number Diff line number Diff line
@@ -12,5 +12,5 @@ val Communal = SceneKey.Communal.toTransitionSceneKey()

// TODO(b/293899074): Remove this file once we can use the scene keys from SceneTransitionLayout.
fun SceneKey.toTransitionSceneKey(): SceneTransitionSceneKey {
    return SceneTransitionSceneKey(name = toString(), identity = this)
    return SceneTransitionSceneKey(debugName = toString(), identity = this)
}
+8 −8
Original line number Diff line number Diff line
@@ -42,16 +42,16 @@ sealed class Key(val debugName: String, val identity: Any) {

/** Key for a scene. */
class SceneKey(
    name: String,
    debugName: String,
    identity: Any = Object(),
) : Key(name, identity), UserActionResult {
) : Key(debugName, identity), UserActionResult {
    @VisibleForTesting
    // TODO(b/240432457): Make internal once PlatformComposeSceneTransitionLayoutTestsUtils can
    // access internal members.
    val testTag: String = "scene:$name"
    val testTag: String = "scene:$debugName"

    /** The unique [ElementKey] identifying this scene's root element. */
    val rootElementKey = ElementKey(name, identity)
    val rootElementKey = ElementKey(debugName, identity)

    // Implementation of [UserActionResult].
    override val toScene: SceneKey = this
@@ -64,7 +64,7 @@ class SceneKey(

/** Key for an element. */
class ElementKey(
    name: String,
    debugName: String,
    identity: Any = Object(),

    /**
@@ -72,11 +72,11 @@ class ElementKey(
     * or compose MovableElements.
     */
    val scenePicker: ElementScenePicker = DefaultElementScenePicker,
) : Key(name, identity), ElementMatcher {
) : Key(debugName, identity), ElementMatcher {
    @VisibleForTesting
    // TODO(b/240432457): Make internal once PlatformComposeSceneTransitionLayoutTestsUtils can
    // access internal members.
    val testTag: String = "element:$name"
    val testTag: String = "element:$debugName"

    override fun matches(key: ElementKey, scene: SceneKey): Boolean {
        return key == this
@@ -99,7 +99,7 @@ class ElementKey(
}

/** Key for a shared value of an element. */
class ValueKey(name: String, identity: Any = Object()) : Key(name, identity) {
class ValueKey(debugName: String, identity: Any = Object()) : Key(debugName, identity) {
    override fun toString(): String {
        return "ValueKey(debugName=$debugName)"
    }