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

Commit 34e3e875 authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

Merge "Move NotificationEntryBuilder to collection pkg"

parents 93dea69a 79c89ece

packages/SystemUI/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ android_library { 
filegroup {

    name: "SystemUI-tests-utils",

    srcs: [

        "tests/src/com/android/systemui/statusbar/NotificationEntryBuilder.java",

        "tests/src/com/android/systemui/statusbar/notification/collection/NotificationEntryBuilder.java",

        "tests/src/com/android/systemui/statusbar/RankingBuilder.java",

        "tests/src/com/android/systemui/statusbar/SbnBuilder.java",

    ],

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

+1 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.statusbar.notification.collection; 


import android.annotation.Nullable;



import com.android.internal.annotations.VisibleForTesting;

import com.android.systemui.Dependency;

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

import com.android.systemui.statusbar.notification.collection.provider.IsHighPriorityProvider;
@@ -68,8 +67,7 @@ public abstract class ListEntry { 
        return mParent;

    }



    @VisibleForTesting

    public void setParent(@Nullable GroupEntry parent) {

    void setParent(@Nullable GroupEntry parent) {

        if (!Objects.equals(mParent, parent)) {

            invalidateParent();

            mParent = parent;

packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -46,11 +46,11 @@ import androidx.test.filters.SmallTest; 


import com.android.internal.messages.nano.SystemMessageProto;

import com.android.systemui.appops.AppOpsController;

import com.android.systemui.statusbar.NotificationEntryBuilder;

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

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

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

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

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



import junit.framework.Assert;

packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceNotificationListenerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ import android.app.Notification; 
import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.systemui.statusbar.NotificationEntryBuilder;

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

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



import org.junit.Before;

import org.junit.Test;

packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleDataTest.java

+1 −1
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ import androidx.test.filters.SmallTest; 


import com.android.systemui.SysuiTestCase;

import com.android.systemui.bubbles.BubbleData.TimeSource;

import com.android.systemui.statusbar.NotificationEntryBuilder;

import com.android.systemui.statusbar.NotificationTestHelper;

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

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

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



import com.google.common.collect.ImmutableList;