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

Commit 88ba9516 authored by Mady Mellor's avatar Mady Mellor
Browse files

Rename the helper to listener 

Flag: EXEMPT rename only
Test: treehugger
Bug: 272102927
Change-Id: Ied8d895260afac644a64be6a0f6b5f1d1d114e1f
parent e5a5e586

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleTaskViewHelperTest.kt→libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleTaskViewListenerTest.kt

+8 −8
Original line number Diff line number Diff line
@@ -55,19 +55,19 @@ import org.mockito.kotlin.verify 
import org.mockito.kotlin.whenever



/**

 * Tests for [BubbleTaskViewHelper].

 * Tests for [BubbleTaskViewListener].

 */

@SmallTest

@RunWith(AndroidJUnit4::class)

class BubbleTaskViewHelperTest {

class BubbleTaskViewListenerTest {



    private val context = ApplicationProvider.getApplicationContext<Context>()



    private var taskViewController = mock<TaskViewController>()

    private var listenerCallback = mock<BubbleTaskViewHelper.Callback>()

    private var listenerCallback = mock<BubbleTaskViewListener.Callback>()

    private var expandedViewManager = mock<BubbleExpandedViewManager>()



    private lateinit var bubbleTaskViewListener: BubbleTaskViewHelper

    private lateinit var bubbleTaskViewListener: BubbleTaskViewListener

    private lateinit var taskView: TaskView

    private lateinit var bubbleTaskView: BubbleTaskView

    private lateinit var parentView: ViewPoster
@@ -87,7 +87,7 @@ class BubbleTaskViewHelperTest { 
        bubbleTaskView = BubbleTaskView(taskView, mainExecutor)



        bubbleTaskViewListener =

            BubbleTaskViewHelper(

            BubbleTaskViewListener(

                context,

                bubbleTaskView,

                parentView,
@@ -104,7 +104,7 @@ class BubbleTaskViewHelperTest { 
        reset(listenerCallback)



        bubbleTaskViewListener =

            BubbleTaskViewHelper(

            BubbleTaskViewListener(

                context,

                bubbleTaskView,

                parentView,
@@ -122,7 +122,7 @@ class BubbleTaskViewHelperTest { 
    @Test

    fun createBubbleTaskViewListener() {

        bubbleTaskViewListener =

            BubbleTaskViewHelper(

            BubbleTaskViewListener(

                context,

                bubbleTaskView,

                parentView,
@@ -318,7 +318,7 @@ class BubbleTaskViewHelperTest { 
        bubbleTaskView = BubbleTaskView(mockTaskView, mainExecutor)



        bubbleTaskViewListener =

            BubbleTaskViewHelper(

            BubbleTaskViewListener(

                context,

                bubbleTaskView,

                parentView,

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTaskViewHelper.java→libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTaskViewListener.java

+5 −5
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ import com.android.internal.protolog.ProtoLog; 
import com.android.wm.shell.shared.bubbles.BubbleAnythingFlagHelper;

import com.android.wm.shell.taskview.TaskView;



public class BubbleTaskViewHelper implements TaskView.Listener {

    private static final String TAG = BubbleTaskViewHelper.class.getSimpleName();

public class BubbleTaskViewListener implements TaskView.Listener {

    private static final String TAG = BubbleTaskViewListener.class.getSimpleName();



    /**

     * Callback to let the view parent of TaskView to be notified of different events.
@@ -63,7 +63,7 @@ public class BubbleTaskViewHelper implements TaskView.Listener { 


    private final Context mContext;

    private final BubbleExpandedViewManager mExpandedViewManager;

    private final BubbleTaskViewHelper.Callback mCallback;

    private final BubbleTaskViewListener.Callback mCallback;

    private final View mParentView;



    private Bubble mBubble;
@@ -207,8 +207,8 @@ public class BubbleTaskViewHelper implements TaskView.Listener { 
        }

    }



    public BubbleTaskViewHelper(Context context, BubbleTaskView bubbleTaskView, View parentView,

            BubbleExpandedViewManager manager, BubbleTaskViewHelper.Callback callback) {

    public BubbleTaskViewListener(Context context, BubbleTaskView bubbleTaskView, View parentView,

            BubbleExpandedViewManager manager, BubbleTaskViewListener.Callback callback) {

        mContext = context;

        mTaskView = bubbleTaskView.getTaskView();

        mParentView = parentView;

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java

+4 −4
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import com.android.wm.shell.bubbles.BubbleLogger; 
import com.android.wm.shell.bubbles.BubbleOverflowContainerView;

import com.android.wm.shell.bubbles.BubblePositioner;

import com.android.wm.shell.bubbles.BubbleTaskView;

import com.android.wm.shell.bubbles.BubbleTaskViewHelper;

import com.android.wm.shell.bubbles.BubbleTaskViewListener;

import com.android.wm.shell.bubbles.Bubbles;

import com.android.wm.shell.bubbles.RegionSamplingProvider;

import com.android.wm.shell.shared.bubbles.BubbleBarLocation;
@@ -56,7 +56,7 @@ import java.util.function.Supplier; 
import javax.inject.Inject;



/** Expanded view of a bubble when it's part of the bubble bar. */

public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskViewHelper.Callback {

public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskViewListener.Callback {

    /**

     * The expanded view listener notifying the {@link BubbleBarLayerView} about the internal

     * actions and events
@@ -110,7 +110,7 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView 
    private BubbleExpandedViewManager mManager;

    private BubblePositioner mPositioner;

    private boolean mIsOverflow;

    private BubbleTaskViewHelper mBubbleTaskViewListener;

    private BubbleTaskViewListener mBubbleTaskViewListener;

    private BubbleBarMenuViewController mMenuViewController;

    @Nullable

    private Supplier<Rect> mLayerBoundsSupplier;
@@ -246,7 +246,7 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView 
            mHandleView.setVisibility(View.GONE);

        } else {

            mTaskView = bubbleTaskView.getTaskView();

            mBubbleTaskViewListener = new BubbleTaskViewHelper(mContext, bubbleTaskView,

            mBubbleTaskViewListener = new BubbleTaskViewListener(mContext, bubbleTaskView,

                    /* viewParent= */ this,

                    expandedViewManager,

                    /* callback= */ this);