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

Commit 26455e4c authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Remove flag: com.android.systemui.priority_people_section 

Flag: EXEMPT removal
Test: presubmit
Fixes: 409607916
Change-Id: I54370ceeceac551faecf2803ce31ce24a3de0c99
parent a60b62c5

packages/SystemUI/aconfig/systemui.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -62,13 +62,6 @@ flag { 
   bug: "376450983"

}



flag {

   name: "priority_people_section"

   namespace: "systemui"

   description: "Add a new section for priority people (aka important conversations)."

   bug: "340294566"

}



flag {

  name: "notifications_redesign_footer_view"

  namespace: "systemui"

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

+0 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import com.android.systemui.statusbar.notification.interruption.VisualInterrupti 
import com.android.systemui.statusbar.notification.shared.NotificationAvalancheSuppression

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

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

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

import javax.inject.Inject



/** A class in which engineers can define flag dependencies */
@@ -46,7 +45,6 @@ class FlagDependencies @Inject constructor(featureFlags: FeatureFlagsClassic, ha 


        // Internal notification frontend dependencies

        NotificationAvalancheSuppression.token dependsOn VisualInterruptionRefactor.token

        PriorityPeopleSection.token dependsOn SortBySectionTimeFlag.token

        NotificationMinimalism.token dependsOn NotificationThrottleHun.token

        ModesEmptyShadeFix.token dependsOn modesUi

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt

+1 −4
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import com.android.systemui.statusbar.notification.promoted.AutomaticPromotionCo 
import com.android.systemui.statusbar.notification.shared.NotificationBundleUi

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

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

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

import javax.inject.Inject



/**
@@ -129,9 +128,7 @@ constructor( 
            mOrderedSections.add(lockScreenMinimalismCoordinator.topUnseenSectioner) // Top Unseen

        }

        mOrderedSections.add(colorizedFgsCoordinator.sectioner) // ForegroundService

        if (PriorityPeopleSection.isEnabled) {

        mOrderedSections.add(conversationCoordinator.priorityPeopleSectioner) // Priority People

        }

        mOrderedSections.add(conversationCoordinator.peopleAlertingSectioner) // People Alerting

        if (!SortBySectionTimeFlag.isEnabled) {

            mOrderedSections.add(conversationCoordinator.peopleSilentSectioner) // People Silent

packages/SystemUI/src/com/android/systemui/statusbar/notification/shared/PriorityPeopleSection.kt

deleted100644 → 0
+0 −51
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.shared



import com.android.systemui.Flags

import com.android.systemui.flags.FlagToken

import com.android.systemui.flags.RefactorFlagUtils



/** Helper for com.android.systemui.Flags.FLAG_PRIORITY_PEOPLE_SECTION */

@Suppress("NOTHING_TO_INLINE")

object PriorityPeopleSection {

    const val FLAG_NAME = Flags.FLAG_PRIORITY_PEOPLE_SECTION



    /** A token used for dependency declaration */

    val token: FlagToken

        get() = FlagToken(FLAG_NAME, isEnabled)



    /** Are sections sorted by time? */

    @JvmStatic

    inline val isEnabled

        get() = Flags.priorityPeopleSection()



    /**

     * 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 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)

}