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

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

[Minimal HUN] Clean minimal hun feature flag 

Bug: 409611477
Flag: EXEMPT flag removal
Former Flag: android.app.compact_heads_up_notification
Test: Presubmit
Change-Id: Ifbca6328a11bece99d75461929ce94f2b90c07ce
parent 1491f937

core/java/android/app/notification.aconfig

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

}



flag {

  name: "compact_heads_up_notification"

  namespace: "systemui"

  description: "[Minimal HUN] Enables the compact heads up notification feature"

  bug: "270709257"

}



flag {

  name: "compact_heads_up_notification_reply"

  namespace: "systemui"

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/HeadsUpStyleProviderImplTest.kt

+0 −11
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 


package com.android.systemui.statusbar.notification.row



import android.app.Flags.FLAG_COMPACT_HEADS_UP_NOTIFICATION

import android.platform.test.annotations.DisableFlags

import android.platform.test.annotations.EnableFlags

import android.platform.test.flag.junit.SetFlagsRule

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest
@@ -48,13 +45,6 @@ class HeadsUpStyleProviderImplTest : SysuiTestCase() { 
    }



    @Test

    @DisableFlags(FLAG_COMPACT_HEADS_UP_NOTIFICATION)

    fun shouldApplyCompactStyle_returnsFalse_whenCompactFlagDisabled() {

        assertThat(headsUpStyleProvider.shouldApplyCompactStyle()).isFalse()

    }



    @Test

    @EnableFlags(FLAG_COMPACT_HEADS_UP_NOTIFICATION)

    fun shouldApplyCompactStyle_returnsTrue_whenImmersiveModeEnabled() {

        // GIVEN

        statusBarModeRepositoryStore.defaultDisplay.isInFullscreenMode.value = true
@@ -64,7 +54,6 @@ class HeadsUpStyleProviderImplTest : SysuiTestCase() { 
    }



    @Test

    @EnableFlags(FLAG_COMPACT_HEADS_UP_NOTIFICATION)

    fun shouldApplyCompactStyle_returnsFalse_whenImmersiveModeDisabled() {

        // GIVEN

        statusBarModeRepositoryStore.defaultDisplay.isInFullscreenMode.value = false

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

+1 −2
Original line number Diff line number Diff line
@@ -1394,8 +1394,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        }

        if (mExpandedWhenPinned) {

            return Math.max(getMaxExpandHeight(), getHeadsUpHeight());

        } else if (android.app.Flags.compactHeadsUpNotification()

                && getShowingLayout().isHUNCompact()) {

        } else if (getShowingLayout().isHUNCompact()) {

            return getHeadsUpHeight();

        } else if (atLeastMinHeight) {

            return Math.max(getCollapsedHeight(), getHeadsUpHeight());

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/HeadsUpStyleProvider.kt

+1 −4
Original line number Diff line number Diff line
@@ -16,10 +16,7 @@ 


package com.android.systemui.statusbar.notification.row



import android.app.Flags

import android.os.SystemProperties

import com.android.systemui.statusbar.data.repository.StatusBarModeRepositoryStore

import com.android.systemui.util.Compile

import javax.inject.Inject



/**
@@ -36,7 +33,7 @@ constructor(private val statusBarModeRepositoryStore: StatusBarModeRepositorySto 
    HeadsUpStyleProvider {



    override fun shouldApplyCompactStyle(): Boolean {

        return Flags.compactHeadsUpNotification() && isInImmersiveMode()

        return isInImmersiveMode()

    }



    private fun isInImmersiveMode() =

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java

+1 −4
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.app.Flags.notificationsRedesignTemplates; 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.Flags;

import android.app.Notification;

import android.app.PendingIntent;

import android.content.Context;
@@ -58,7 +57,6 @@ import com.android.systemui.statusbar.TransformableView; 
import com.android.systemui.statusbar.notification.FeedbackIcon;

import com.android.systemui.statusbar.notification.NotificationFadeAware;

import com.android.systemui.statusbar.notification.NotificationUtils;

import com.android.systemui.statusbar.notification.collection.EntryAdapter;

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

import com.android.systemui.statusbar.notification.collection.RemoteInputEntryAdapter;

import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager;
@@ -570,8 +568,7 @@ public class NotificationContentView extends FrameLayout implements Notification 
        mHeadsUpWrapper = NotificationViewWrapper.wrap(getContext(), child,

                mContainingNotification);



        mIsHUNCompact = Flags.compactHeadsUpNotification()

                && mHeadsUpWrapper instanceof NotificationCompactHeadsUpTemplateViewWrapper;

        mIsHUNCompact = mHeadsUpWrapper instanceof NotificationCompactHeadsUpTemplateViewWrapper;

        if (mIsHUNCompact) {

            logCompactHUNShownEvent();

        }