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

Commit 1a5e22f8 authored by Ned Burns's avatar Ned Burns
Browse files

Rename NotificationInflater to NotificationContentInflater 

We have two separate inflation steps; this class name was confusing.

Test: atest
Change-Id: Iaacf8bf81c755cc2ea217d81674fbacfd52360e4
parent d120e754

packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java

+2 −3
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ import com.android.systemui.statusbar.notification.NotificationEntryListener; 
import com.android.systemui.statusbar.notification.NotificationEntryManager;

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

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

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

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

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



import java.util.HashMap;
@@ -349,8 +349,7 @@ public class BubbleController implements BubbleExpandedView.OnBubbleBlockedListe 
        }



        @Override

        public void onEntryInflated(NotificationEntry entry,

                @NotificationInflater.InflationFlag int inflatedFlags) {

        public void onEntryInflated(NotificationEntry entry, @InflationFlag int inflatedFlags) {

            if (!areBubblesEnabled(mContext)) {

                return;

            }

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.NotificationInflater.InflationFlag;

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



import java.util.stream.Stream;

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

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.systemui.statusbar;



import static com.android.systemui.statusbar.notification.row.NotificationInflater.FLAG_CONTENT_VIEW_AMBIENT;

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



import android.annotation.NonNull;

import android.content.Context;
@@ -26,7 +26,7 @@ import android.util.ArraySet; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.systemui.R;

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

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

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



import javax.inject.Inject;

import javax.inject.Singleton;

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

+4 −5
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
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.NotificationInflater.FLAG_CONTENT_VIEW_AMBIENT;

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

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

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



import android.app.Notification;

import android.service.notification.StatusBarNotification;
@@ -30,7 +30,7 @@ import com.android.systemui.statusbar.AmbientPulseManager; 
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.NotificationInflater;

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

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

import com.android.systemui.statusbar.policy.HeadsUpManager;
@@ -102,8 +102,7 @@ public class NotificationAlertingManager { 
     * @param entry         entry to add

     * @param inflatedFlags flags representing content views that were inflated

     */

    private void showAlertingView(NotificationEntry entry,

            @NotificationInflater.InflationFlag int inflatedFlags) {

    private void showAlertingView(NotificationEntry entry, @InflationFlag int inflatedFlags) {

        if ((inflatedFlags & FLAG_CONTENT_VIEW_HEADS_UP) != 0) {

            // Possible for shouldHeadsUp to change between the inflation starting and ending.

            // If it does and we no longer need to heads up, we should free the view.

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

+2 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.service.notification.StatusBarNotification; 


import com.android.internal.statusbar.NotificationVisibility;

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

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

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



/**

 * Listener interface for changes sent by NotificationEntryManager.
@@ -65,8 +65,7 @@ public interface NotificationEntryListener { 
    /**

     * Called when a notification's views are inflated for the first time.

     */

    default void onEntryInflated(NotificationEntry entry,

            @NotificationInflater.InflationFlag int inflatedFlags) {

    default void onEntryInflated(NotificationEntry entry, @InflationFlag int inflatedFlags) {

    }



    /**