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

Commit dd32f99d authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Add sections manager checks

Fixes: 205968645
Test: atest NotificationSectionsManager.java
Change-Id: I5111edaae7104191a33f37dce7f47da437defa50
parent a1dd246c
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.view.LayoutInflater
import android.view.View
import com.android.internal.annotations.VisibleForTesting
import com.android.systemui.R
import com.android.systemui.flags.FeatureFlags
import com.android.systemui.media.KeyguardMediaController
import com.android.systemui.plugins.statusbar.StatusBarStateController
import com.android.systemui.statusbar.StatusBarState
@@ -53,6 +54,7 @@ import javax.inject.Inject
 * TODO: Move remaining sections logic from NSSL into this class.
 */
class NotificationSectionsManager @Inject internal constructor(
    private val featureFlags: FeatureFlags,
    private val statusBarStateController: StatusBarStateController,
    private val configurationController: ConfigurationController,
    private val keyguardMediaController: KeyguardMediaController,
@@ -199,6 +201,7 @@ class NotificationSectionsManager @Inject internal constructor(
                override var targetPosition: Int? = null

                override fun adjustViewPosition() {
                    featureFlags.checkLegacyPipelineEnabled()
                    val target = targetPosition
                    val current = currentPosition
                    if (target == null) {
@@ -225,6 +228,7 @@ class NotificationSectionsManager @Inject internal constructor(
    private fun <T : StackScrollerDecorView> decorViewHeaderState(
        header: T
    ): SectionUpdateState<T> {
        featureFlags.checkLegacyPipelineEnabled()
        val inner = expandableViewHeaderState(header)
        return object : SectionUpdateState<T> by inner {
            override fun adjustViewPosition() {
@@ -241,6 +245,7 @@ class NotificationSectionsManager @Inject internal constructor(
     * bookkeeping and adds/moves/removes section headers if appropriate.
     */
    fun updateSectionBoundaries(reason: String) {
        featureFlags.checkLegacyPipelineEnabled()
        if (!isUsingMultipleSections) {
            return
        }
+3 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import androidx.test.filters.SmallTest;

import com.android.systemui.ActivityStarterDelegate;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.flags.FeatureFlags;
import com.android.systemui.media.KeyguardMediaController;
import com.android.systemui.plugins.statusbar.StatusBarStateController;
import com.android.systemui.statusbar.StatusBarState;
@@ -79,6 +80,7 @@ public class NotificationSectionsManagerTest extends SysuiTestCase {
    @Rule public final MockitoRule mockitoRule = MockitoJUnit.rule();

    @Mock private NotificationStackScrollLayout mNssl;
    @Mock private FeatureFlags mFeatureFlags;
    @Mock private ActivityStarterDelegate mActivityStarterDelegate;
    @Mock private StatusBarStateController mStatusBarStateController;
    @Mock private ConfigurationController mConfigurationController;
@@ -120,6 +122,7 @@ public class NotificationSectionsManagerTest extends SysuiTestCase {
        when(mSilentHeaderController.getHeaderView()).thenReturn(mock(SectionHeaderView.class));
        mSectionsManager =
                new NotificationSectionsManager(
                        mFeatureFlags,
                        mStatusBarStateController,
                        mConfigurationController,
                        mKeyguardMediaController,