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

Commit a99a9692 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ib03aafe9,Ia51a6db6 

* changes:
  Abstract content binding into an interface
  Move control logic out of NotificationContentInflater
parents fe3aa5d6 ec093095

packages/SystemUI/src/com/android/systemui/statusbar/AlertingNotificationManager.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import android.view.accessibility.AccessibilityEvent; 


import com.android.internal.annotations.VisibleForTesting;

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

import com.android.systemui.statusbar.notification.row.NotificationContentInflater.InflationFlag;

import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.InflationFlag;



import java.util.stream.Stream;

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationAlertingManager.java

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.systemui.statusbar.notification;



import static com.android.systemui.statusbar.NotificationRemoteInputManager.FORCE_REMOTE_INPUT_HISTORY;

import static com.android.systemui.statusbar.notification.row.NotificationContentInflater.FLAG_CONTENT_VIEW_HEADS_UP;

import static com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_HEADS_UP;



import android.app.Notification;

import android.service.notification.StatusBarNotification;
@@ -28,7 +28,7 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController; 
import com.android.systemui.statusbar.NotificationListener;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

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

import com.android.systemui.statusbar.notification.row.NotificationContentInflater.InflationFlag;

import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.InflationFlag;

import com.android.systemui.statusbar.policy.HeadsUpManager;



import javax.inject.Inject;

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryListener.java

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import androidx.annotation.NonNull; 


import com.android.internal.statusbar.NotificationVisibility;

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

import com.android.systemui.statusbar.notification.row.NotificationContentInflater.InflationFlag;

import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.InflationFlag;



/**

 * Listener interface for changes sent by NotificationEntryManager.

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java

+4 −3
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.systemui.statusbar.notification; 
import static android.service.notification.NotificationListenerService.REASON_CANCEL;

import static android.service.notification.NotificationListenerService.REASON_ERROR;



import static com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.InflationCallback;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.Notification;
@@ -45,8 +47,7 @@ import com.android.systemui.statusbar.notification.collection.NotificationRowBin 
import com.android.systemui.statusbar.notification.logging.NotifEvent;

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

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

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

import com.android.systemui.statusbar.notification.row.NotificationContentInflater.InflationFlag;

import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.InflationFlag;

import com.android.systemui.statusbar.notification.stack.NotificationListContainer;

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

import com.android.systemui.statusbar.policy.HeadsUpManager;
@@ -94,7 +95,7 @@ import javax.inject.Singleton; 
@Singleton

public class NotificationEntryManager implements

        Dumpable,

        NotificationContentInflater.InflationCallback,

        InflationCallback,

        VisualStabilityManager.Callback {

    private static final String TAG = "NotificationEntryMgr";

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);

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

+1 −1
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ import com.android.systemui.statusbar.notification.InflationException; 
import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifFilter;

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

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

import com.android.systemui.statusbar.notification.row.NotificationContentInflater.InflationFlag;

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

import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.InflationFlag;

import com.android.systemui.statusbar.notification.stack.NotificationSectionsManager;



import java.util.ArrayList;