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

Commit 7fda7b66 authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Ensure corners are rounded of prioroty conversations 

Bug: 340294566
Test: n/a
Flag: com.android.systemui.priority_people_section
Change-Id: I46ff61299e7f2897115e9f7172a05335360b718e
parent ce6f860b

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationSectionsFeatureManager.kt

+14 −0
Original line number Diff line number Diff line
@@ -22,11 +22,13 @@ import android.provider.DeviceConfig 
import com.android.internal.annotations.VisibleForTesting

import com.android.internal.config.sysui.SystemUiDeviceConfigFlags.NOTIFICATIONS_USE_PEOPLE_FILTERING

import com.android.systemui.dagger.SysUISingleton

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

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

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

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

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

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

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

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

import com.android.systemui.util.DeviceConfigProxy

import com.android.systemui.util.Utils
@@ -53,6 +55,18 @@ class NotificationSectionsFeatureManager @Inject constructor( 
    }



    fun getNotificationBuckets(): IntArray {

        if (PriorityPeopleSection.isEnabled) {

            // We don't need this list to be adaptive, it can be the superset of all features.

            return intArrayOf(

                    BUCKET_MEDIA_CONTROLS,

                    BUCKET_HEADS_UP,

                    BUCKET_FOREGROUND_SERVICE,

                    BUCKET_PRIORITY_PEOPLE,

                    BUCKET_PEOPLE,

                    BUCKET_ALERTING,

                    BUCKET_SILENT,

                )

        }

        return when {

            isFilteringEnabled() && isMediaControlsEnabled() ->

                intArrayOf(BUCKET_HEADS_UP, BUCKET_FOREGROUND_SERVICE, BUCKET_MEDIA_CONTROLS,

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationSectionsFeatureManagerTest.kt

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.statusbar.notification



import android.platform.test.annotations.DisableFlags

import android.provider.DeviceConfig

import android.provider.Settings

import android.testing.AndroidTestingRunner
@@ -25,6 +26,7 @@ import com.android.dx.mockito.inline.extended.ExtendedMockito 


import com.android.internal.config.sysui.SystemUiDeviceConfigFlags.NOTIFICATIONS_USE_PEOPLE_FILTERING

import com.android.systemui.SysuiTestCase

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

import com.android.systemui.util.DeviceConfigProxyFake

import com.android.systemui.util.Utils

import com.android.systemui.util.mockito.any
@@ -41,6 +43,7 @@ import org.mockito.quality.Strictness 


@RunWith(AndroidTestingRunner::class)

@SmallTest

@DisableFlags(PriorityPeopleSection.FLAG_NAME)  // this class has no logic with the flag enabled

class NotificationSectionsFeatureManagerTest : SysuiTestCase() {

    var manager: NotificationSectionsFeatureManager? = null

    val proxyFake = DeviceConfigProxyFake()