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

Commit cb3aab75 authored by Lucas Silva's avatar Lucas Silva Committed by Android (Google) Code Review
Browse files

Merge "Revert "Make communal_hub flag dependent on keyguard_shade_migration_nssl"" into main

parents 5e20acb9 3d4df7a7

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

+0 −7
Original line number Original line Diff line number Diff line
@@ -22,10 +22,8 @@ import com.android.server.notification.Flags.FLAG_VIBRATE_WHILE_UNLOCKED 
import com.android.server.notification.Flags.crossAppPoliteNotifications

import com.android.server.notification.Flags.crossAppPoliteNotifications

import com.android.server.notification.Flags.politeNotifications

import com.android.server.notification.Flags.politeNotifications

import com.android.server.notification.Flags.vibrateWhileUnlocked

import com.android.server.notification.Flags.vibrateWhileUnlocked

import com.android.systemui.Flags.FLAG_COMMUNAL_HUB

import com.android.systemui.Flags.FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR

import com.android.systemui.Flags.FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR

import com.android.systemui.Flags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT

import com.android.systemui.Flags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT

import com.android.systemui.Flags.communalHub

import com.android.systemui.Flags.keyguardBottomAreaRefactor

import com.android.systemui.Flags.keyguardBottomAreaRefactor

import com.android.systemui.Flags.migrateClocksToBlueprint

import com.android.systemui.Flags.migrateClocksToBlueprint

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.SysUISingleton
@@ -65,9 +63,6 @@ class FlagDependencies @Inject constructor(featureFlags: FeatureFlagsClassic, ha 
        ComposeLockscreen.token dependsOn KeyguardShadeMigrationNssl.token

        ComposeLockscreen.token dependsOn KeyguardShadeMigrationNssl.token

        ComposeLockscreen.token dependsOn keyguardBottomAreaRefactor

        ComposeLockscreen.token dependsOn keyguardBottomAreaRefactor

        ComposeLockscreen.token dependsOn migrateClocksToBlueprint

        ComposeLockscreen.token dependsOn migrateClocksToBlueprint



        // CommunalHub dependencies

        communalHub dependsOn KeyguardShadeMigrationNssl.token

    }

    }





    private inline val politeNotifications

    private inline val politeNotifications
@@ -80,6 +75,4 @@ class FlagDependencies @Inject constructor(featureFlags: FeatureFlagsClassic, ha 
        get() = FlagToken(FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR, keyguardBottomAreaRefactor())

        get() = FlagToken(FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR, keyguardBottomAreaRefactor())

    private inline val migrateClocksToBlueprint

    private inline val migrateClocksToBlueprint

        get() = FlagToken(FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT, migrateClocksToBlueprint())

        get() = FlagToken(FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT, migrateClocksToBlueprint())

    private inline val communalHub

        get() = FlagToken(FLAG_COMMUNAL_HUB, communalHub())

}
 
}