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

Commit 8aac302d authored by Julia Tuttle's avatar Julia Tuttle Committed by Android (Google) Code Review
Browse files

Merge "[New Pipeline] Hide section headers when keyguard showing"

parents c917cdee d9b9cf9c

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

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 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



import com.android.systemui.dagger.SysUISingleton

import javax.inject.Inject



/**

 * A class which keeps track of whether section headers should be shown in the notification shade.

 *

 * (In an ideal world, this would directly monitor the state of the keyguard and invalidate the

 * pipeline to show/hide headers, but the KeyguardController already invalidates the pipeline when

 * the keyguard's state changes. Instead of having both classes monitor for state changes and ending

 * up with duplicate runs of the pipeline, we let the KeyguardController update the header

 * visibility when it invalidates, and we just store that state here.)

 */

@SysUISingleton

class SectionHeaderVisibilityProvider @Inject constructor() {

    var sectionHeadersVisible = true

}
 
 No newline at end of file

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.java

+10 −2
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ import com.android.keyguard.KeyguardUpdateMonitorCallback; 
import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.StatusBarState;

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

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

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

import com.android.systemui.statusbar.notification.collection.NotifPipeline;
@@ -48,7 +50,8 @@ import com.android.systemui.statusbar.policy.KeyguardStateController; 
import javax.inject.Inject;



/**

 * Filters low priority and privacy-sensitive notifications from the lockscreen.

 * Filters low priority and privacy-sensitive notifications from the lockscreen, and hides section

 * headers on the lockscreen.

 */

@CoordinatorScope

public class KeyguardCoordinator implements Coordinator {
@@ -62,6 +65,7 @@ public class KeyguardCoordinator implements Coordinator { 
    private final StatusBarStateController mStatusBarStateController;

    private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;

    private final HighPriorityProvider mHighPriorityProvider;

    private final SectionHeaderVisibilityProvider mSectionHeaderVisibilityProvider;



    private boolean mHideSilentNotificationsOnLockscreen;
@@ -74,7 +78,8 @@ public class KeyguardCoordinator implements Coordinator { 
            BroadcastDispatcher broadcastDispatcher,

            StatusBarStateController statusBarStateController,

            KeyguardUpdateMonitor keyguardUpdateMonitor,

            HighPriorityProvider highPriorityProvider) {

            HighPriorityProvider highPriorityProvider,

            SectionHeaderVisibilityProvider sectionHeaderVisibilityProvider) {

        mContext = context;

        mMainHandler = mainThreadHandler;

        mKeyguardStateController = keyguardStateController;
@@ -83,6 +88,7 @@ public class KeyguardCoordinator implements Coordinator { 
        mStatusBarStateController = statusBarStateController;

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

        mHighPriorityProvider = highPriorityProvider;

        mSectionHeaderVisibilityProvider = sectionHeaderVisibilityProvider;

    }



    @Override
@@ -214,6 +220,8 @@ public class KeyguardCoordinator implements Coordinator { 
    }



    private void invalidateListFromFilter(String reason) {

        mSectionHeaderVisibilityProvider.setSectionHeadersVisible(

                mStatusBarStateController.getState() != StatusBarState.KEYGUARD);

        mNotifFilter.invalidateList();

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/NodeSpecBuilder.kt

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


package com.android.systemui.statusbar.notification.collection.render



import com.android.systemui.statusbar.notification.SectionHeaderVisibilityProvider

import com.android.systemui.statusbar.notification.NotificationSectionsFeatureManager

import com.android.systemui.statusbar.notification.collection.GroupEntry

import com.android.systemui.statusbar.notification.collection.ListEntry
@@ -35,6 +36,7 @@ import com.android.systemui.util.traceSection 
class NodeSpecBuilder(

    private val mediaContainerController: MediaContainerController,

    private val sectionsFeatureManager: NotificationSectionsFeatureManager,

    private val sectionHeaderVisibilityProvider: SectionHeaderVisibilityProvider,

    private val viewBarn: NotifViewBarn

) {

    fun buildNodeSpec(
@@ -51,6 +53,7 @@ class NodeSpecBuilder( 


        var currentSection: NotifSection? = null

        val prevSections = mutableSetOf<NotifSection?>()

        val showHeaders = sectionHeaderVisibilityProvider.sectionHeadersVisible



        for (entry in notifList) {

            val section = entry.section!!
@@ -61,7 +64,7 @@ class NodeSpecBuilder( 


            // If this notif begins a new section, first add the section's header view

            if (section != currentSection) {

                if (section.headerController != currentSection?.headerController) {

                if (section.headerController != currentSection?.headerController && showHeaders) {

                    section.headerController?.let { headerController ->

                        root.children.add(NodeSpecImpl(root, headerController))

                    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/ShadeViewManager.kt

+4 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.statusbar.notification.collection.render 
import android.content.Context

import android.view.View

import com.android.systemui.statusbar.notification.NotificationSectionsFeatureManager

import com.android.systemui.statusbar.notification.SectionHeaderVisibilityProvider

import com.android.systemui.statusbar.notification.collection.GroupEntry

import com.android.systemui.statusbar.notification.collection.ListEntry

import com.android.systemui.statusbar.notification.collection.NotificationEntry
@@ -38,13 +39,15 @@ class ShadeViewManager @AssistedInject constructor( 
    @Assisted private val stackController: NotifStackController,

    mediaContainerController: MediaContainerController,

    featureManager: NotificationSectionsFeatureManager,

    sectionHeaderVisibilityProvider: SectionHeaderVisibilityProvider,

    logger: ShadeViewDifferLogger,

    private val viewBarn: NotifViewBarn

) {

    // We pass a shim view here because the listContainer may not actually have a view associated

    // with it and the differ never actually cares about the root node's view.

    private val rootController = RootNodeController(listContainer, View(context))

    private val specBuilder = NodeSpecBuilder(mediaContainerController, featureManager, viewBarn)

    private val specBuilder = NodeSpecBuilder(mediaContainerController, featureManager,

            sectionHeaderVisibilityProvider, viewBarn)

    private val viewDiffer = ShadeViewDiffer(rootController, logger)



    /** Method for attaching this manager to the pipeline. */

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorTest.java

+3 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import com.android.systemui.broadcast.BroadcastDispatcher; 
import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.RankingBuilder;

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

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

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

import com.android.systemui.statusbar.notification.collection.NotifPipeline;
@@ -70,6 +71,7 @@ public class KeyguardCoordinatorTest extends SysuiTestCase { 
    @Mock private StatusBarStateController mStatusBarStateController;

    @Mock private KeyguardUpdateMonitor mKeyguardUpdateMonitor;

    @Mock private HighPriorityProvider mHighPriorityProvider;

    @Mock private SectionHeaderVisibilityProvider mSectionHeaderVisibilityProvider;

    @Mock private NotifPipeline mNotifPipeline;



    private NotificationEntry mEntry;
@@ -81,7 +83,7 @@ public class KeyguardCoordinatorTest extends SysuiTestCase { 
        KeyguardCoordinator keyguardCoordinator = new KeyguardCoordinator(

                mContext, mMainHandler, mKeyguardStateController, mLockscreenUserManager,

                mBroadcastDispatcher, mStatusBarStateController,

                mKeyguardUpdateMonitor, mHighPriorityProvider);

                mKeyguardUpdateMonitor, mHighPriorityProvider, mSectionHeaderVisibilityProvider);



        mEntry = new NotificationEntryBuilder()

                .setUser(new UserHandle(NOTIF_USER_ID))