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

Commit 71d15364 authored by Ned Burns's avatar Ned Burns Committed by Android (Google) Code Review
Browse files

Merge changes from topic "notiflistbuilder" 

* changes:
  Add NotifListBuilder to new notif pipeline
  Add Dagger-injectable version of SystemClock
parents 2da22cdc 77050aa8

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+1 −1
Original line number Diff line number Diff line
@@ -96,12 +96,12 @@ import com.android.systemui.statusbar.SysuiStatusBarStateController; 
import com.android.systemui.statusbar.VibratorHelper;

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

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

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

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

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

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

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

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

import com.android.systemui.statusbar.notification.collection.init.NewNotifPipeline;

import com.android.systemui.statusbar.notification.logging.NotificationLogger;

import com.android.systemui.statusbar.notification.row.NotificationGutsManager;

import com.android.systemui.statusbar.phone.AutoHideController;

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java

+1 −1
Original line number Diff line number Diff line
@@ -56,12 +56,12 @@ import com.android.systemui.statusbar.SysuiStatusBarStateController; 
import com.android.systemui.statusbar.VibratorHelper;

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

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

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

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

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

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

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

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

import com.android.systemui.statusbar.notification.collection.init.NewNotifPipeline;

import com.android.systemui.statusbar.notification.logging.NotificationLogger;

import com.android.systemui.statusbar.notification.row.NotificationGutsManager;

import com.android.systemui.statusbar.phone.AutoHideController;

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+12 −0
Original line number Diff line number Diff line
@@ -28,10 +28,14 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController; 
import com.android.systemui.recents.Recents;

import com.android.systemui.stackdivider.Divider;

import com.android.systemui.statusbar.CommandQueue;

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

import com.android.systemui.statusbar.notification.collection.listbuilder.NotifListBuilder;

import com.android.systemui.statusbar.notification.people.PeopleHubModule;

import com.android.systemui.statusbar.phone.KeyguardLiftController;

import com.android.systemui.statusbar.phone.StatusBar;

import com.android.systemui.util.sensors.AsyncSensorManager;

import com.android.systemui.util.time.SystemClock;

import com.android.systemui.util.time.SystemClockImpl;



import javax.inject.Singleton;
@@ -84,4 +88,12 @@ public abstract class SystemUIModule { 


    @BindsOptionalOf

    abstract StatusBar optionalStatusBar();



    @Singleton

    @Binds

    abstract SystemClock bindSystemClock(SystemClockImpl systemClock);



    @Singleton

    @Binds

    abstract NotifListBuilder bindNotifListBuilder(NotifListBuilderImpl impl);

}

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifListBuilder.java→packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/CollectionReadyForBuildListener.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import java.util.Collection; 
 * Interface for the class responsible for converting a NotifCollection into the final sorted,

 * filtered, and grouped list of currently visible notifications.

 */

public interface NotifListBuilder {

public interface CollectionReadyForBuildListener {

    /**

     * Called after the NotifCollection has received an update from NotificationManager but before

     * it dispatches any change events to its listeners. This is to inform the list builder that

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

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

 * Copyright (C) 2019 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.collection;



import android.annotation.Nullable;



import java.util.ArrayList;

import java.util.Collections;

import java.util.Comparator;

import java.util.List;



/**

 * Represents a set of grouped notifications. The final notification list is usually a mix of

 * GroupEntries and NotificationEntries.

 */

public class GroupEntry extends ListEntry {

    @Nullable private NotificationEntry mSummary;

    private final List<NotificationEntry> mChildren = new ArrayList<>();



    private final List<NotificationEntry> mUnmodifiableChildren =

            Collections.unmodifiableList(mChildren);



    GroupEntry(String key) {

        super(key);

    }



    @Override

    public NotificationEntry getRepresentativeEntry() {

        return mSummary;

    }



    @Nullable

    public NotificationEntry getSummary() {

        return mSummary;

    }



    public List<NotificationEntry> getChildren() {

        return mUnmodifiableChildren;

    }



    void setSummary(@Nullable NotificationEntry summary) {

        mSummary = summary;

    }



    void clearChildren() {

        mChildren.clear();

    }



    void addChild(NotificationEntry child) {

        mChildren.add(child);

    }



    void sortChildren(Comparator<? super NotificationEntry> c) {

        mChildren.sort(c);

    }



    List<NotificationEntry> getRawChildren() {

        return mChildren;

    }



    public static final GroupEntry ROOT_ENTRY = new GroupEntry("<root>");

}