Merge "Clean up dead code" into main (4bee8c55) · Commits · e / os / android_frameworks_base

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

+0 −14

Original line number	Diff line number	Diff line
		@@ -1001,20 +1001,6 @@ public class BubbleController implements ConfigurationChangeListener,
		}
		}

		// TODO(b/416297506) remove this code too
		private void showBubbleBarExpandedViewDropTarget(BubbleBarLocation bubbleBarLocation) {
		ensureBubbleViewsAndWindowCreated();
		if (mLayerView != null) {
		mLayerView.showBubbleBarExtendedViewDropTarget(bubbleBarLocation);
		}
		}

		private void hideBubbleBarExpandedViewDropTarget() {
		if (mLayerView != null) {
		mLayerView.hideBubbleBarExpandedViewDropTarget();
		}
		}

		/** Whether this userId belongs to the current user. */
		private boolean isCurrentProfile(int userId) {
		return userId == UserHandle.USER_ALL

+0 −11

Original line number	Diff line number	Diff line
		@@ -254,17 +254,6 @@ public class BubbleBarLayerView extends FrameLayout
		splitScreenModeChecker, desktopWindowModeChecker, bubbleBarPropertiesProvider);
		}

		/** Hides the expanded view drop target. */
		public void hideBubbleBarExpandedViewDropTarget() {
		mBubbleExpandedViewPinController.hideDropTarget();
		}

		/** Shows the expanded view drop target at the requested {@link BubbleBarLocation location} */
		public void showBubbleBarExtendedViewDropTarget(@NonNull BubbleBarLocation bubbleBarLocation) {
		setVisibility(VISIBLE);
		mBubbleExpandedViewPinController.showDropTarget(bubbleBarLocation);
		}

		@Override
		protected void onAttachedToWindow() {
		super.onAttachedToWindow();