Merge "Pass the bubble bar screen coordinates to WMShell" into udc-qpr-dev (57d68b48) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -113,8 +113,8 @@ public class BubbleBarViewController {
		mBubbleStashController.stashBubbleBar();
		} else {
		mBubbleBarController.setSelectedBubble(bubble);
		mSystemUiProxy.showBubble(bubble.getKey(),
		mBubbleStashController.isBubblesShowingOnHome());
		int[] bubbleBarCoords = mBarView.getLocationOnScreen();
		mSystemUiProxy.showBubble(bubble.getKey(), bubbleBarCoords[0], bubbleBarCoords[1]);
		}
		}

		@@ -293,8 +293,8 @@ public class BubbleBarViewController {
		} else {
		final String selectedKey = mBubbleBarController.getSelectedBubbleKey();
		if (selectedKey != null) {
		mSystemUiProxy.showBubble(selectedKey,
		mBubbleStashController.isBubblesShowingOnHome());
		int[] bubbleBarCoords = mBarView.getLocationOnScreen();
		mSystemUiProxy.showBubble(selectedKey, bubbleBarCoords[0], bubbleBarCoords[1]);
		} else {
		Log.w(TAG, "trying to expand bubbles when there isn't one selected");
		}

+4 −4

Original line number	Diff line number	Diff line
		@@ -646,13 +646,13 @@ public class SystemUiProxy implements ISystemUiProxy {
		/**
		* Tells SysUI to show the bubble with the provided key.
		* @param key the key of the bubble to show.
		* @param onLauncherHome whether the bubble is showing on launcher home or not (modifies where
		* the expanded bubble view is placed).
		* @param bubbleBarXCoordinate the X coordinate of the bubble bar on the screen.
		* @param bubbleBarYCoordinate the Y coordinate of the bubble bar on the screen.
		*/
		public void showBubble(String key, boolean onLauncherHome) {
		public void showBubble(String key, int bubbleBarXCoordinate, int bubbleBarYCoordinate) {
		if (mBubbles != null) {
		try {
		mBubbles.showBubble(key, onLauncherHome);
		mBubbles.showBubble(key, bubbleBarXCoordinate, bubbleBarYCoordinate);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed call showBubble");
		}