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

Commit 35296eb7 authored by Yining Liu's avatar Yining Liu Committed by Android (Google) Code Review
Browse files

Merge changes I5346d011,Ic997737c into main 

* changes:
  Fix the missing HUN removal animation for delayed group notification
  Add aconfig flag for fixing the missing HUN removal animation for group
parents 7f02af9c eca83c7a

packages/SystemUI/aconfig/systemui.aconfig

+11 −0
Original line number Diff line number Diff line
@@ -216,6 +216,17 @@ flag { 
    bug: "294830092"

}



flag {

    name: "notification_group_hun_removal_animation_fix"

    namespace: "systemui"

    description: "Fix the lack of hun removal animation for group notifications"

        "(not GROUP_ALERT_SUMMARY)"

    bug: "343475993"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "scene_container"

    namespace: "systemui"

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

+7 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import com.android.systemui.statusbar.notification.dagger.IncomingHeader 
import com.android.systemui.statusbar.notification.interruption.HeadsUpViewBinder

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

import com.android.systemui.statusbar.notification.logKey

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

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

import com.android.systemui.statusbar.policy.HeadsUpManager

import com.android.systemui.statusbar.policy.OnHeadsUpChangedListener
@@ -726,6 +727,12 @@ class HeadsUpCoordinator @Inject constructor( 
     */

    private fun isAttemptingToShowHun(entry: ListEntry) =

        mHeadsUpManager.isHeadsUpEntry(entry.key) || isEntryBinding(entry)

                || isHeadsUpAnimatingAway(entry)



    private fun isHeadsUpAnimatingAway(entry: ListEntry): Boolean {

        if (!GroupHunAnimationFix.isEnabled) return false

        return entry.representativeEntry?.row?.isHeadsUpAnimatingAway ?: false

    }



    /**

     * Whether the notification is already heads up/binding per [isAttemptingToShowHun] OR if it

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

0 → 100644
+52 −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.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_NOTIFICATION_GROUP_HUN_REMOVAL_ANIMATION_FIX */

@Suppress("NOTHING_TO_INLINE")

object GroupHunAnimationFix {

    const val FLAG_NAME = Flags.FLAG_NOTIFICATION_GROUP_HUN_REMOVAL_ANIMATION_FIX



    /** 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.notificationGroupHunRemovalAnimationFix()



    /**

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

}