Merge "Updated shell IPC methods" into main (32748b57) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleControllerBubbleBarTest.kt

+1 −3

Original line number	Diff line number	Diff line
		@@ -497,8 +497,6 @@ class BubbleControllerBubbleBarTest {

		override fun animateBubbleBarLocation(location: BubbleBarLocation?) {}

		override fun onDragItemOverBubbleBarDragZone(location: BubbleBarLocation) {}

		override fun onItemDraggedOutsideBubbleBarDropZone() {}
		override fun showBubbleBarPillowAt(location: BubbleBarLocation?) {}
		}
		}

+1 −3

Original line number	Diff line number	Diff line
		@@ -26,7 +26,5 @@ class FakeBubblesStateListener : Bubbles.BubbleStateListener {

		override fun animateBubbleBarLocation(location: BubbleBarLocation?) {}

		override fun onDragItemOverBubbleBarDragZone(location: BubbleBarLocation) {}

		override fun onItemDraggedOutsideBubbleBarDropZone() {}
		override fun showBubbleBarPillowAt(location: BubbleBarLocation?) {}
		}

+4 −11

Original line number	Diff line number	Diff line
		@@ -942,10 +942,9 @@ public class BubbleController implements ConfigurationChangeListener,
		/**
		* Show bubble bar pin view given location.
		*/
		public void showBubbleBarPinAtLocation(BubbleBarLocation bubbleBarLocation) {
		public void showBubbleBarPinAtLocation(@Nullable BubbleBarLocation bubbleBarLocation) {
		if (isShowingAsBubbleBar() && mBubbleStateListener != null) {
		// TODO(b/411505605) show bubble bar drop target in launcher since taskbar window is
		// layered on top of the shell drag window
		mBubbleStateListener.showBubbleBarPillowAt(bubbleBarLocation);
		}
		}

		@@ -3016,14 +3015,8 @@ public class BubbleController implements ConfigurationChangeListener,
		}

		@Override
		public void onDragItemOverBubbleBarDragZone(
		@NonNull BubbleBarLocation location) {
		mListener.call(l -> l.onDragItemOverBubbleBarDragZone(location));
		}

		@Override
		public void onItemDraggedOutsideBubbleBarDropZone() {
		mListener.call(IBubblesListener::onItemDraggedOutsideBubbleBarDropZone);
		public void showBubbleBarPillowAt(@Nullable BubbleBarLocation location) {
		mListener.call(l -> l.showBubbleBarPillowAt(location));
		}
		};

+5 −10

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@ import android.window.ScreenCapture.ScreenshotHardwareBuffer;
		import android.window.ScreenCapture.SynchronousScreenCaptureListener;

		import androidx.annotation.IntDef;
		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;

		import com.android.wm.shell.shared.annotations.ExternalThread;
		@@ -356,16 +355,12 @@ public interface Bubbles {
		void animateBubbleBarLocation(BubbleBarLocation location);

		/**
		* Called when an application icon is being dragged over the Bubble Bar drop zone.
		* The location of the Bubble Bar is provided as an argument.
		*/
		void onDragItemOverBubbleBarDragZone(@NonNull BubbleBarLocation location);

		/**
		* Called when an application icon is being dragged outside the Bubble Bar drop zone.
		* Always called after {@link #onDragItemOverBubbleBarDragZone(BubbleBarLocation)}
		* Show the bubble bar pillow view at the provided location.
		* If the location is null, the pillow view is should be hidden.
		*
		* @param location The location to show the pillow view, or null to hide it.
		*/
		void onItemDraggedOutsideBubbleBarDropZone();
		void showBubbleBarPillowAt(@Nullable BubbleBarLocation location);
		}

		/** Listener to find out about stack expansion / collapse events. */

+4 −10

Original line number	Diff line number	Diff line
		@@ -35,14 +35,8 @@ oneway interface IBubblesListener {
		void animateBubbleBarLocation(in BubbleBarLocation location);

		/**
		* Called when an application icon is being dragged over the Bubble Bar drop zone.
		* The location of the Bubble Bar is provided as an argument.
		* Show the bubble bar pillow view at the provided location.
		* If the location is null, the pillow view is should be hidden.
		*/
		void onDragItemOverBubbleBarDragZone(in BubbleBarLocation location);

		/**
		* Called when an application icon is being dragged outside the Bubble Bar drop zone.
		* Always called after {@link #onDragItemOverBubbleBarDragZone(BubbleBarLocation)}
		*/
		void onItemDraggedOutsideBubbleBarDropZone();
		void showBubbleBarPillowAt(in BubbleBarLocation location);
		}
		No newline at end of file