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

Commit 49fb6997 authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge "[RONs] Delete two redundant static flag wrappers" into main

parents c8e45304 5039839f

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/NotificationSection.kt

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ import com.android.systemui.statusbar.notification.icon.ui.viewbinder.Notificati 
import com.android.systemui.statusbar.notification.icon.ui.viewbinder.StatusBarIconViewBindingFailureTracker

import com.android.systemui.statusbar.notification.icon.ui.viewmodel.NotificationIconContainerAlwaysOnDisplayViewModel

import com.android.systemui.statusbar.notification.promoted.AODPromotedNotification

import com.android.systemui.statusbar.notification.promoted.PromotedNotificationUiAod

import com.android.systemui.statusbar.notification.promoted.PromotedNotificationUi

import com.android.systemui.statusbar.notification.promoted.ui.viewmodel.AODPromotedNotificationViewModel

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout

import com.android.systemui.statusbar.notification.stack.ui.view.NotificationScrollView
@@ -111,7 +111,7 @@ constructor( 


    @Composable

    fun AodPromotedNotificationArea(modifier: Modifier = Modifier) {

        if (!PromotedNotificationUiAod.isEnabled) {

        if (!PromotedNotificationUi.isEnabled) {

            return

        }

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/NotificationStackSizeCalculatorTest.kt

+4 −4
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import com.android.systemui.statusbar.SysuiStatusBarStateController 
import com.android.systemui.statusbar.notification.collection.EntryAdapter

import com.android.systemui.statusbar.notification.collection.NotificationEntry

import com.android.systemui.statusbar.notification.domain.interactor.SeenNotificationsInteractor

import com.android.systemui.statusbar.notification.promoted.PromotedNotificationUiForceExpanded

import com.android.systemui.statusbar.notification.promoted.PromotedNotificationUi

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow

import com.android.systemui.statusbar.notification.row.ExpandableView

import com.android.systemui.statusbar.policy.ResourcesSplitShadeStateController
@@ -155,7 +155,7 @@ class NotificationStackSizeCalculatorTest : SysuiTestCase() { 
    }



    @Test

    @EnableFlags(PromotedNotificationUiForceExpanded.FLAG_NAME)

    @EnableFlags(PromotedNotificationUi.FLAG_NAME)

    fun maxKeyguardNotificationsForPromotedOngoing_onLockscreenSpaceForMinHeightButNotIntrinsicHeight_returnsOne() {

        setGapHeight(0f)

        // No divider height since we're testing one element where index = 0
@@ -283,7 +283,7 @@ class NotificationStackSizeCalculatorTest : SysuiTestCase() { 
    }



    @Test

    @EnableFlags(PromotedNotificationUiForceExpanded.FLAG_NAME)

    @EnableFlags(PromotedNotificationUi.FLAG_NAME)

    fun getSpaceNeeded_onLockscreenEnoughSpacePromotedOngoing_intrinsicHeight() {

        setGapHeight(0f)

        // No divider height since we're testing one element where index = 0
@@ -342,7 +342,7 @@ class NotificationStackSizeCalculatorTest : SysuiTestCase() { 
    }



    @Test

    @EnableFlags(PromotedNotificationUiForceExpanded.FLAG_NAME)

    @EnableFlags(PromotedNotificationUi.FLAG_NAME)

    fun getSpaceNeeded_onLockscreenSavingSpacePromotedOngoing_minHeight() {

        setGapHeight(0f)

        // No divider height since we're testing one element where index = 0

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardClockInteractor.kt

+3 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import com.android.systemui.scene.shared.flag.SceneContainerFlag 
import com.android.systemui.shade.domain.interactor.ShadeModeInteractor

import com.android.systemui.statusbar.notification.domain.interactor.ActiveNotificationsInteractor

import com.android.systemui.statusbar.notification.domain.interactor.HeadsUpNotificationInteractor

import com.android.systemui.statusbar.notification.promoted.PromotedNotificationUiAod

import com.android.systemui.statusbar.notification.promoted.PromotedNotificationUi

import com.android.systemui.statusbar.notification.promoted.domain.interactor.AODPromotedNotificationInteractor

import com.android.systemui.util.kotlin.combine

import com.android.systemui.utils.coroutines.flow.flatMapLatestConflated
@@ -90,14 +90,14 @@ constructor( 
    var clock: ClockController? by keyguardClockRepository.clockEventController::clock



    private val isAodPromotedNotificationPresent: Flow<Boolean> =

        if (PromotedNotificationUiAod.isEnabled) {

        if (PromotedNotificationUi.isEnabled) {

            aodPromotedNotificationInteractor.isPresent

        } else {

            flowOf(false)

        }



    private val areAnyNotificationsPresent: Flow<Boolean> =

        if (PromotedNotificationUiAod.isEnabled) {

        if (PromotedNotificationUi.isEnabled) {

            combine(

                activeNotificationsInteractor.areAnyNotificationsPresent,

                isAodPromotedNotificationPresent,

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/AodNotificationIconsSection.kt

+3 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import com.android.systemui.statusbar.notification.icon.ui.viewbinder.AlwaysOnDi 
import com.android.systemui.statusbar.notification.icon.ui.viewbinder.NotificationIconContainerViewBinder

import com.android.systemui.statusbar.notification.icon.ui.viewbinder.StatusBarIconViewBindingFailureTracker

import com.android.systemui.statusbar.notification.icon.ui.viewmodel.NotificationIconContainerAlwaysOnDisplayViewModel

import com.android.systemui.statusbar.notification.promoted.PromotedNotificationUiAod

import com.android.systemui.statusbar.notification.promoted.PromotedNotificationUi

import com.android.systemui.statusbar.phone.NotificationIconContainer

import com.android.systemui.statusbar.ui.SystemBarUtilsState

import com.android.systemui.util.ui.value
@@ -102,7 +102,7 @@ constructor( 
        val isShadeLayoutWide = shadeModeInteractor.isShadeLayoutWide.value



        constraintSet.apply {

            if (PromotedNotificationUiAod.isEnabled) {

            if (PromotedNotificationUi.isEnabled) {

                connect(nicId, TOP, AodPromotedNotificationSection.viewId, BOTTOM, bottomMargin)

            } else {

                connect(nicId, TOP, R.id.smart_space_barrier_bottom, BOTTOM, bottomMargin)
@@ -111,7 +111,7 @@ constructor( 
            setGoneMargin(nicId, BOTTOM, bottomMargin)

            setVisibility(nicId, if (isVisible.value) VISIBLE else GONE)



            if (PromotedNotificationUiAod.isEnabled && isShadeLayoutWide) {

            if (PromotedNotificationUi.isEnabled && isShadeLayoutWide) {

                // Don't create a start constraint, so the icons can hopefully right-align.

            } else {

                connect(nicId, START, PARENT_ID, START, horizontalMargin)

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/AodPromotedNotificationSection.kt

+5 −5
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import com.android.systemui.shade.ShadeDisplayAware 
import com.android.systemui.shade.domain.interactor.ShadeModeInteractor

import com.android.systemui.statusbar.notification.promoted.AODPromotedNotification

import com.android.systemui.statusbar.notification.promoted.PromotedNotificationLogger

import com.android.systemui.statusbar.notification.promoted.PromotedNotificationUiAod

import com.android.systemui.statusbar.notification.promoted.PromotedNotificationUi

import com.android.systemui.statusbar.notification.promoted.ui.viewmodel.AODPromotedNotificationViewModel

import javax.inject.Inject
@@ -50,7 +50,7 @@ constructor( 
    }



    override fun addViews(constraintLayout: ConstraintLayout) {

        if (!PromotedNotificationUiAod.isEnabled) {

        if (!PromotedNotificationUi.isEnabled) {

            return

        }
@@ -67,7 +67,7 @@ constructor( 
    }



    override fun bindData(constraintLayout: ConstraintLayout) {

        if (!PromotedNotificationUiAod.isEnabled) {

        if (!PromotedNotificationUi.isEnabled) {

            return

        }
@@ -79,7 +79,7 @@ constructor( 
    }



    override fun applyConstraints(constraintSet: ConstraintSet) {

        if (!PromotedNotificationUiAod.isEnabled) {

        if (!PromotedNotificationUi.isEnabled) {

            return

        }
@@ -119,7 +119,7 @@ constructor( 
    }



    override fun removeViews(constraintLayout: ConstraintLayout) {

        if (!PromotedNotificationUiAod.isEnabled) {

        if (!PromotedNotificationUi.isEnabled) {

            return

        }