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

Commit 63db155f authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge changes I2cc194ad,I1ed99b7f,I404a307a into tm-qpr-dev 

* changes:
  Reinflate active notifications when SHOW_NOTIFICATION_SNOOZE setting changes.
  New Pipeline: Move SectionClassifier to the provider package
  New Pipeline: Move SectionHeaderVisibilityProvider to the provider package
parents a9abf3ce 9cb34c46

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

+1 −1
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@ package com.android.systemui.statusbar.notification.collection.coordinator; 
import com.android.keyguard.KeyguardUpdateMonitor;

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

import com.android.systemui.statusbar.StatusBarState;

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

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

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

import com.android.systemui.statusbar.notification.collection.coordinator.dagger.CoordinatorScope;

import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifFilter;

import com.android.systemui.statusbar.notification.collection.provider.HighPriorityProvider;

import com.android.systemui.statusbar.notification.interruption.KeyguardNotificationVisibilityProvider;

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



import javax.inject.Inject;

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

+5 −5
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;



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

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

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

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

import com.android.systemui.statusbar.notification.collection.NotificationEntry;
@@ -28,6 +27,7 @@ import com.android.systemui.statusbar.notification.collection.coordinator.dagger 
import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifFilter;

import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSectioner;

import com.android.systemui.statusbar.notification.collection.provider.HighPriorityProvider;

import com.android.systemui.statusbar.notification.collection.provider.SectionStyleProvider;

import com.android.systemui.statusbar.notification.collection.render.NodeController;

import com.android.systemui.statusbar.notification.collection.render.SectionHeaderController;

import com.android.systemui.statusbar.notification.dagger.AlertingHeader;
@@ -51,7 +51,7 @@ public class RankingCoordinator implements Coordinator { 
    public static final boolean SHOW_ALL_SECTIONS = false;

    private final StatusBarStateController mStatusBarStateController;

    private final HighPriorityProvider mHighPriorityProvider;

    private final SectionClassifier mSectionClassifier;

    private final SectionStyleProvider mSectionStyleProvider;

    private final NodeController mSilentNodeController;

    private final SectionHeaderController mSilentHeaderController;

    private final NodeController mAlertingHeaderController;
@@ -62,13 +62,13 @@ public class RankingCoordinator implements Coordinator { 
    public RankingCoordinator(

            StatusBarStateController statusBarStateController,

            HighPriorityProvider highPriorityProvider,

            SectionClassifier sectionClassifier,

            SectionStyleProvider sectionStyleProvider,

            @AlertingHeader NodeController alertingHeaderController,

            @SilentHeader SectionHeaderController silentHeaderController,

            @SilentHeader NodeController silentNodeController) {

        mStatusBarStateController = statusBarStateController;

        mHighPriorityProvider = highPriorityProvider;

        mSectionClassifier = sectionClassifier;

        mSectionStyleProvider = sectionStyleProvider;

        mAlertingHeaderController = alertingHeaderController;

        mSilentNodeController = silentNodeController;

        mSilentHeaderController = silentHeaderController;
@@ -77,7 +77,7 @@ public class RankingCoordinator implements Coordinator { 
    @Override

    public void attach(NotifPipeline pipeline) {

        mStatusBarStateController.addCallback(mStatusBarStateCallback);

        mSectionClassifier.setMinimizedSections(Collections.singleton(mMinimizedNotifSectioner));

        mSectionStyleProvider.setMinimizedSections(Collections.singleton(mMinimizedNotifSectioner));



        pipeline.addPreGroupFilter(mSuspendedFilter);

        pipeline.addPreGroupFilter(mDndVisualEffectsFilter);

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/RowAppearanceCoordinator.kt

+3 −3
Original line number Diff line number Diff line
@@ -19,11 +19,11 @@ package com.android.systemui.statusbar.notification.collection.coordinator 
import android.content.Context

import com.android.systemui.R

import com.android.systemui.statusbar.notification.AssistantFeedbackController

import com.android.systemui.statusbar.notification.SectionClassifier

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

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

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

import com.android.systemui.statusbar.notification.collection.coordinator.dagger.CoordinatorScope

import com.android.systemui.statusbar.notification.collection.provider.SectionStyleProvider

import com.android.systemui.statusbar.notification.collection.render.NotifRowController

import javax.inject.Inject
@@ -35,7 +35,7 @@ import javax.inject.Inject 
class RowAppearanceCoordinator @Inject internal constructor(

    context: Context,

    private var mAssistantFeedbackController: AssistantFeedbackController,

    private var mSectionClassifier: SectionClassifier

    private var mSectionStyleProvider: SectionStyleProvider

) : Coordinator {



    private var entryToExpand: NotificationEntry? = null
@@ -55,7 +55,7 @@ class RowAppearanceCoordinator @Inject internal constructor( 


    private fun onBeforeRenderList(list: List<ListEntry>) {

        entryToExpand = list.firstOrNull()?.representativeEntry?.takeIf { entry ->

            !mSectionClassifier.isMinimizedSection(entry.section!!)

            !mSectionStyleProvider.isMinimizedSection(entry.section!!)

        }

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotifUiAdjustment.kt

+7 −5
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ class NotifUiAdjustment internal constructor( 
    val smartActions: List<Notification.Action>,

    val smartReplies: List<CharSequence>,

    val isConversation: Boolean,

    val isSnoozeEnabled: Boolean,

    val isMinimized: Boolean,

    val needsRedaction: Boolean,

) {
@@ -42,6 +43,7 @@ class NotifUiAdjustment internal constructor( 
        ): Boolean = when {

            oldAdjustment === newAdjustment -> false

            oldAdjustment.isConversation != newAdjustment.isConversation -> true

            oldAdjustment.isSnoozeEnabled != newAdjustment.isSnoozeEnabled -> true

            oldAdjustment.isMinimized != newAdjustment.isMinimized -> true

            oldAdjustment.needsRedaction != newAdjustment.needsRedaction -> true

            areDifferent(oldAdjustment.smartActions, newAdjustment.smartActions) -> true

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/NotifUiAdjustmentProvider.kt

+32 −4
Original line number Diff line number Diff line
@@ -16,12 +16,18 @@ 


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



import android.database.ContentObserver

import android.os.Handler

import android.os.UserHandle

import android.provider.Settings.Secure.SHOW_NOTIFICATION_SNOOZE

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.statusbar.NotificationLockscreenUserManager

import com.android.systemui.statusbar.notification.SectionClassifier

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

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

import com.android.systemui.statusbar.notification.collection.provider.SectionStyleProvider

import com.android.systemui.util.ListenerSet

import com.android.systemui.util.settings.SecureSettings

import javax.inject.Inject



/**
@@ -30,14 +36,23 @@ import javax.inject.Inject 
 */

@SysUISingleton

class NotifUiAdjustmentProvider @Inject constructor(

    @Main private val handler: Handler,

    private val secureSettings: SecureSettings,

    private val lockscreenUserManager: NotificationLockscreenUserManager,

    private val sectionClassifier: SectionClassifier,

    private val sectionStyleProvider: SectionStyleProvider

) {

    private val dirtyListeners = ListenerSet<Runnable>()

    private var isSnoozeEnabled = false



    fun addDirtyListener(listener: Runnable) {

        if (dirtyListeners.isEmpty()) {

            lockscreenUserManager.addNotificationStateChangedListener(notifStateChangedListener)

            updateSnoozeEnabled()

            secureSettings.registerContentObserverForUser(

                SHOW_NOTIFICATION_SNOOZE,

                settingsObserver,

                UserHandle.USER_ALL

            )

        }

        dirtyListeners.addIfAbsent(listener)

    }
@@ -46,6 +61,7 @@ class NotifUiAdjustmentProvider @Inject constructor( 
        dirtyListeners.remove(listener)

        if (dirtyListeners.isEmpty()) {

            lockscreenUserManager.removeNotificationStateChangedListener(notifStateChangedListener)

            secureSettings.unregisterContentObserver(settingsObserver)

        }

    }
@@ -54,10 +70,21 @@ class NotifUiAdjustmentProvider @Inject constructor( 
            dirtyListeners.forEach(Runnable::run)

        }



    private val settingsObserver = object : ContentObserver(handler) {

        override fun onChange(selfChange: Boolean) {

            updateSnoozeEnabled()

            dirtyListeners.forEach(Runnable::run)

        }

    }



    private fun updateSnoozeEnabled() {

        isSnoozeEnabled = secureSettings.getInt(SHOW_NOTIFICATION_SNOOZE, 0) == 1

    }



    private fun isEntryMinimized(entry: NotificationEntry): Boolean {

        val section = entry.section ?: error("Entry must have a section to determine if minimized")

        val parent = entry.parent ?: error("Entry must have a parent to determine if minimized")

        val isMinimizedSection = sectionClassifier.isMinimizedSection(section)

        val isMinimizedSection = sectionStyleProvider.isMinimizedSection(section)

        val isTopLevelEntry = parent == GroupEntry.ROOT_ENTRY

        val isGroupSummary = parent.summary == entry

        return isMinimizedSection && (isTopLevelEntry || isGroupSummary)
@@ -73,6 +100,7 @@ class NotifUiAdjustmentProvider @Inject constructor( 
        smartActions = entry.ranking.smartActions,

        smartReplies = entry.ranking.smartReplies,

        isConversation = entry.ranking.isConversation,

        isSnoozeEnabled = isSnoozeEnabled,

        isMinimized = isEntryMinimized(entry),

        needsRedaction = lockscreenUserManager.needsRedaction(entry),

    )