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

Commit c9ae1ad9 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Remove duplicate binding of RowContentBindStage 

This did not need to be bound in the
ExpandableNotificationRowComponent as it was already injectable
globally. This silences a dagger warning that would have eventually
become an error:

Bug: 160781930
Test: manual && atest SystemUITests
Change-Id: I4286dc4d8f1bd431da35d2243006e263d5c1362f
parent 492a1399

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

+0 −1
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ public class NotificationRowBinderImpl implements NotificationRowBinder { 
                                        .expandableNotificationRow(row)

                                        .notificationEntry(entry)

                                        .onDismissRunnable(onDismissRunnable)

                                        .rowContentBindStage(mRowContentBindStage)

                                        .onExpandClickListener(mPresenter)

                                        .build();

                        ExpandableNotificationRowController rowController =

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/dagger/ExpandableNotificationRowComponent.java

+0 −3
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import com.android.systemui.statusbar.notification.collection.NotificationEntry; 
import com.android.systemui.statusbar.notification.row.ActivatableNotificationView;

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

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

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

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



import dagger.Binds;
@@ -57,8 +56,6 @@ public interface ExpandableNotificationRowComponent { 
        @BindsInstance

        Builder onDismissRunnable(@DismissRunnable Runnable runnable);

        @BindsInstance

        Builder rowContentBindStage(RowContentBindStage rowContentBindStage);

        @BindsInstance

        Builder onExpandClickListener(ExpandableNotificationRow.OnExpandClickListener presenter);

        ExpandableNotificationRowComponent build();

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationEntryManagerInflationTest.java

+4 −15
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ import org.junit.After; 
import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Answers;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.Mockito;
@@ -121,8 +122,8 @@ public class NotificationEntryManagerInflationTest extends SysuiTestCase { 
    @Mock private NotificationGutsManager mGutsManager;

    @Mock private NotificationRemoteInputManager mRemoteInputManager;

    @Mock private NotificationMediaManager mNotificationMediaManager;

    @Mock private ExpandableNotificationRowComponent.Builder

            mExpandableNotificationRowComponentBuilder;

    @Mock(answer = Answers.RETURNS_SELF)

    private ExpandableNotificationRowComponent.Builder mExpandableNotificationRowComponentBuilder;

    @Mock private ExpandableNotificationRowComponent mExpandableNotificationRowComponent;

    @Mock private FalsingManager mFalsingManager;

    @Mock private KeyguardBypassController mKeyguardBypassController;
@@ -211,21 +212,9 @@ public class NotificationEntryManagerInflationTest extends SysuiTestCase { 
        when(mExpandableNotificationRowComponentBuilder

                .expandableNotificationRow(viewCaptor.capture()))

                .thenReturn(mExpandableNotificationRowComponentBuilder);

        when(mExpandableNotificationRowComponentBuilder

                .notificationEntry(any()))

                .thenReturn(mExpandableNotificationRowComponentBuilder);

        when(mExpandableNotificationRowComponentBuilder

                .onDismissRunnable(any()))

                .thenReturn(mExpandableNotificationRowComponentBuilder);

        when(mExpandableNotificationRowComponentBuilder

                .rowContentBindStage(any()))

                .thenReturn(mExpandableNotificationRowComponentBuilder);

        when(mExpandableNotificationRowComponentBuilder

                .onExpandClickListener(any()))

                .thenReturn(mExpandableNotificationRowComponentBuilder);



        when(mExpandableNotificationRowComponentBuilder.build())

                .thenReturn(mExpandableNotificationRowComponent);



        when(mExpandableNotificationRowComponent.getExpandableNotificationRowController())

                .thenAnswer((Answer<ExpandableNotificationRowController>) invocation ->

                        new ExpandableNotificationRowController(