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

Commit e0383ab8 authored by Yining Liu's avatar Yining Liu
Browse files

Fix empty HUN group header when async group header is enabled 

Fixes the issue that when posting a high-priority
notification group with the alerting behavior:
GROUP_ALERT_SUMMARY, the heads-up notification group has
empty group header.

Fix: 331218195
Flag: ACONFIG notification_async_group_header_inflation STAGING
Test: PlatformScenarioTests
TapChildOfHeadsUpSummary#tapChildOfHeadsUpSummary

Change-Id: If55c9f801ab742ae17a3409f0ea202e288b1356a
parent 74217e5c

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java

+2 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import com.android.systemui.statusbar.notification.row.ExpandableView; 
import com.android.systemui.statusbar.notification.row.HybridGroupManager;

import com.android.systemui.statusbar.notification.row.HybridNotificationView;

import com.android.systemui.statusbar.notification.row.shared.AsyncGroupHeaderViewInflation;

import com.android.systemui.statusbar.notification.row.shared.AsyncHybridViewInflation;

import com.android.systemui.statusbar.notification.row.wrapper.NotificationHeaderViewWrapper;

import com.android.systemui.statusbar.notification.row.wrapper.NotificationViewWrapper;
@@ -1429,7 +1430,7 @@ public class NotificationChildrenContainer extends ViewGroup 
            if (singleLineView != null) {

                minExpandHeight += singleLineView.getHeight();

            } else {

                if (AsyncGroupHeaderViewInflation.isEnabled()) {

                if (AsyncHybridViewInflation.isEnabled()) {

                    minExpandHeight += mMinSingleLineHeight;

                } else {

                    Log.e(TAG, "getMinHeight: child " + child.getEntry().getKey()

packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceController.java

+7 −3
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import com.android.systemui.statusbar.notification.SourceType; 
import com.android.systemui.statusbar.notification.collection.NotificationEntry;

import com.android.systemui.statusbar.notification.domain.interactor.HeadsUpNotificationIconInteractor;

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

import com.android.systemui.statusbar.notification.row.shared.AsyncGroupHeaderViewInflation;

import com.android.systemui.statusbar.notification.shared.NotificationIconContainerRefactor;

import com.android.systemui.statusbar.notification.stack.NotificationRoundnessManager;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController;
@@ -421,10 +422,13 @@ public class HeadsUpAppearanceController extends ViewController<HeadsUpStatusBar 
    public void updateHeader(NotificationEntry entry) {

        ExpandableNotificationRow row = entry.getRow();

        float headerVisibleAmount = 1.0f;

        // To fix the invisible HUN group header issue

        if (!AsyncGroupHeaderViewInflation.isEnabled()) {

            if (row.isPinned() || row.isHeadsUpAnimatingAway() || row == mTrackedChild

                    || row.showingPulsing()) {

                headerVisibleAmount = mAppearFraction;

            }

        }

        row.setHeaderVisibleAmount(headerVisibleAmount);

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceControllerTest.java

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import static org.mockito.Mockito.reset; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.platform.test.annotations.DisableFlags;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.testing.TestableLooper.RunWithLooper;
@@ -46,6 +47,7 @@ import com.android.systemui.statusbar.notification.collection.NotificationEntry; 
import com.android.systemui.statusbar.notification.domain.interactor.HeadsUpNotificationIconInteractor;

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

import com.android.systemui.statusbar.notification.row.NotificationTestHelper;

import com.android.systemui.statusbar.notification.row.shared.AsyncGroupHeaderViewInflation;

import com.android.systemui.statusbar.notification.stack.NotificationRoundnessManager;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController;

import com.android.systemui.statusbar.policy.Clock;
@@ -157,6 +159,7 @@ public class HeadsUpAppearanceControllerTest extends SysuiTestCase { 
    }



    @Test

    @DisableFlags(AsyncGroupHeaderViewInflation.FLAG_NAME)

    public void testHeaderUpdated() {

        mRow.setPinned(true);

        when(mHeadsUpManager.hasPinnedHeadsUp()).thenReturn(true);