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

Commit 531276aa authored by Chandru S's avatar Chandru S
Browse files

Remove COMPOSE_BOUNCER_ENABLED enabled static flag 

with the removal of SCENE_CONTAINER_ENABELD, most of the compose and
flexiglass dependencies are already part of the main sysui APK.

This flag is not needed anymore and isn't making a big difference to
odex file size

Flag: ACONFIG com.android.systemui.compose_bouncer DEVELOPMENT
Test: everything builds, no bloatbuster warning
Bug: 280877228
Bug: 310005730
Change-Id: I08a52ebe5cfe7c2bdfd327b219d7f26d91c81d35
parent d120662b

packages/SystemUI/src/com/android/systemui/bouncer/ui/binder/BouncerViewBinder.kt

+3 −2
Original line number Diff line number Diff line
@@ -12,14 +12,15 @@ import com.android.systemui.bouncer.ui.BouncerDialogFactory 
import com.android.systemui.bouncer.ui.viewmodel.BouncerViewModel

import com.android.systemui.bouncer.ui.viewmodel.KeyguardBouncerViewModel

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.flags.Flags.COMPOSE_BOUNCER_ENABLED

import com.android.systemui.keyguard.ui.viewmodel.PrimaryBouncerToGoneTransitionViewModel

import com.android.systemui.log.BouncerLogger

import com.android.systemui.user.domain.interactor.SelectedUserInteractor

import dagger.Lazy

import javax.inject.Inject

import kotlinx.coroutines.ExperimentalCoroutinesApi



/** Helper data class that allows to lazy load all the dependencies of the legacy bouncer. */

@OptIn(ExperimentalCoroutinesApi::class)

@SysUISingleton

data class LegacyBouncerDependencies

@Inject
@@ -59,7 +60,7 @@ constructor( 
    private val composeBouncerDependencies: Lazy<ComposeBouncerDependencies>,

) {

    fun bind(view: ViewGroup) {

        if (COMPOSE_BOUNCER_ENABLED && composeBouncerFlags.isOnlyComposeBouncerEnabled()) {

        if (composeBouncerFlags.isOnlyComposeBouncerEnabled()) {

            val deps = composeBouncerDependencies.get()

            ComposeBouncerViewBinder.bind(

                view,

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −7
Original line number Diff line number Diff line
@@ -410,13 +410,6 @@ object Flags { 
    val CLIPBOARD_SHARED_TRANSITIONS =

            unreleasedFlag("clipboard_shared_transitions", teamfood = true)



    /**

     * Whether the compose bouncer is enabled. This ensures ProGuard can

     * remove unused code from our APK at compile time.

     */

    // TODO(b/280877228): Tracking Bug

    @JvmField val COMPOSE_BOUNCER_ENABLED = false



    // 1900

    @JvmField val NOTE_TASKS = releasedFlag("keycode_flag")