Merge "Don't tell expanded controller about gestures unless we are expanded." into rvc-dev (43d32906) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -445,6 +445,10 @@ public class BubbleStackView extends FrameLayout
		final boolean clickedBubbleIsCurrentlyExpandedBubble =
		clickedBubble.getKey().equals(mExpandedBubble.getKey());

		if (isExpanded()) {
		mExpandedAnimationController.onGestureFinished();
		}

		if (isExpanded() && !clickedBubbleIsCurrentlyExpandedBubble) {
		if (clickedBubble != mBubbleData.getSelectedBubble()) {
		// Select the clicked bubble.
		@@ -464,7 +468,6 @@ public class BubbleStackView extends FrameLayout
		mBubbleData.setExpanded(!mBubbleData.isExpanded());
		}
		}
		mExpandedAnimationController.onGestureFinished();
		}
		};