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

Commit b75eb44b authored by Ibrahim Yilmaz's avatar Ibrahim Yilmaz
Browse files

Add ui_rich_ongoing_force_expanded flag 

Bug: 380901479
Flag: com.android.systemui.ui_rich_ongoing_force_expanded
Test: Presubmit
Change-Id: Ib11ca41734349c35a0b2f126237acbba2c090064
parent 01611f83

packages/SystemUI/aconfig/systemui.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -1940,3 +1940,10 @@ flag { 
        purpose: PURPOSE_BUGFIX

   }

}



flag {

    name: "ui_rich_ongoing_force_expanded"

    namespace: "systemui"

    description: "Force promoted notifications to always be expanded"

    bug: "380901479"

}

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

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ import com.android.systemui.shade.shared.flag.DualShade 
import com.android.systemui.statusbar.notification.collection.SortBySectionTimeFlag

import com.android.systemui.statusbar.notification.emptyshade.shared.ModesEmptyShadeFix

import com.android.systemui.statusbar.notification.interruption.VisualInterruptionRefactor

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

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

import com.android.systemui.statusbar.notification.shared.NotificationAvalancheSuppression

import com.android.systemui.statusbar.notification.shared.NotificationMinimalism

import com.android.systemui.statusbar.notification.shared.NotificationThrottleHun
@@ -52,6 +54,7 @@ class FlagDependencies @Inject constructor(featureFlags: FeatureFlagsClassic, ha 
        NotificationMinimalism.token dependsOn NotificationThrottleHun.token

        ModesEmptyShadeFix.token dependsOn modesUi



        PromotedNotificationUiForceExpanded.token dependsOn PromotedNotificationUi.token

        // SceneContainer dependencies

        SceneContainerFlag.getFlagDependencies().forEach { (alpha, beta) -> alpha dependsOn beta }

packages/SystemUI/src/com/android/systemui/statusbar/notification/promoted/PromotedNotificationUiForceExpanded.kt

0 → 100644
+61 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.statusbar.notification.promoted



import com.android.systemui.Flags

import com.android.systemui.flags.FlagToken

import com.android.systemui.flags.RefactorFlagUtils



/** Helper for reading or using the expanded ui rich ongoing flag state. */

@Suppress("NOTHING_TO_INLINE")

object PromotedNotificationUiForceExpanded {

    /** The aconfig flag name */

    const val FLAG_NAME = Flags.FLAG_UI_RICH_ONGOING_FORCE_EXPANDED



    /** A token used for dependency declaration */

    val token: FlagToken

        get() = FlagToken(FLAG_NAME, isEnabled)



    /** Is the refactor enabled */

    @JvmStatic

    inline val isEnabled

        get() = Flags.uiRichOngoingForceExpanded()



    /**

     * Called to ensure code is only run when the flag is enabled. This protects users from the

     * unintended behaviors caused by accidentally running new logic, while also crashing on an eng

     * build to ensure that the refactor author catches issues in testing.

     */

    @JvmStatic

    inline fun isUnexpectedlyInLegacyMode() =

        RefactorFlagUtils.isUnexpectedlyInLegacyMode(isEnabled, FLAG_NAME)



    /**

     * Called to ensure code is only run when the flag is enabled. This will throw an exception if

     * the flag is not enabled to ensure that the refactor author catches issues in testing.

     * Caution!! Using this check incorrectly will cause crashes in nextfood builds!

     */

    @JvmStatic

    inline fun assertInNewMode() = RefactorFlagUtils.assertInNewMode(isEnabled, FLAG_NAME)



    /**

     * Called to ensure code is only run when the flag is disabled. This will throw an exception if

     * the flag is enabled to ensure that the refactor author catches issues in testing.

     */

    @JvmStatic

    inline fun assertInLegacyMode() = RefactorFlagUtils.assertInLegacyMode(isEnabled, FLAG_NAME)

}