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

Commit 0d281bf7 authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Include SceneContainerFlags in SceneContainerStartable dump

Flag: NA
Test: dumpsysui SceneContainerStartable
Change-Id: Ibc5211093ddeb5eb5d54efd0a0da41c0dd2edea5
parent f8bfb6da
Loading
Loading
Loading
Loading
+3 −5
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import com.android.systemui.CoreStartable
import com.android.systemui.dagger.SysUISingleton
import com.android.systemui.util.Compile
import com.android.systemui.util.asIndenting
import com.android.systemui.util.withIncreasedIndent
import com.android.systemui.util.printCollection
import dagger.Binds
import dagger.Module
import dagger.multibindings.ClassKey
@@ -59,10 +59,8 @@ abstract class FlagDependenciesBase(

    override fun dump(pw: PrintWriter, args: Array<out String>) {
        pw.asIndenting().run {
            println("allDependencies: ${allDependencies.size}")
            withIncreasedIndent { allDependencies.forEach(::println) }
            println("unmetDependencies: ${unmetDependencies.size}")
            withIncreasedIndent { unmetDependencies.forEach(::println) }
            printCollection("allDependencies", allDependencies)
            printCollection("unmetDependencies", unmetDependencies)
        }
    }

+14 −0
Original line number Diff line number Diff line
@@ -44,6 +44,11 @@ import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICA
import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE
import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED
import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING
import com.android.systemui.statusbar.notification.stack.shared.flexiNotifsEnabled
import com.android.systemui.util.asIndenting
import com.android.systemui.util.printSection
import com.android.systemui.util.println
import java.io.PrintWriter
import javax.inject.Inject
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -94,6 +99,15 @@ constructor(
        }
    }

    override fun dump(pw: PrintWriter, args: Array<out String>) =
        pw.asIndenting().run {
            printSection("SceneContainerFlags") {
                println("isEnabled", flags.isEnabled())
                printSection("requirementDescription") { println(flags.requirementDescription()) }
                println("flexiNotifsEnabled", flags.flexiNotifsEnabled())
            }
        }

    /** Updates the visibility of the scene container. */
    private fun hydrateVisibility() {
        applicationScope.launch {
+6 −0
Original line number Diff line number Diff line
@@ -60,6 +60,12 @@ fun IndentingPrintWriter.withIncreasedIndent(runnable: Runnable) {
fun IndentingPrintWriter.println(label: String, value: Any?) =
    append(label).append('=').println(value)

/** Print a section with a header using the given name and an indented body */
inline fun IndentingPrintWriter.printSection(sectionName: String, block: () -> Unit) {
    append(sectionName).println(":")
    withIncreasedIndent(block)
}

@JvmOverloads
inline fun <T> IndentingPrintWriter.printCollection(
    label: String,