Merge "Remove some unused / deprecated code" (064c79ee) · Commits · e / os / android_frameworks_base

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

+0 −17

Original line number	Diff line number	Diff line
		@@ -73,7 +73,6 @@ import com.android.systemui.R;
		import com.android.systemui.bubbles.animation.ExpandedAnimationController;
		import com.android.systemui.bubbles.animation.PhysicsAnimationLayout;
		import com.android.systemui.bubbles.animation.StackAnimationController;
		import com.android.systemui.statusbar.notification.collection.NotificationEntry;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		@@ -716,22 +715,6 @@ public class BubbleStackView extends FrameLayout {
		return mExpandedBubble;
		}

		/**
		* Sets the bubble that should be expanded and expands if needed.
		*
		* @param key the {@link NotificationEntry#key} associated with the bubble to expand.
		* @deprecated replaced by setSelectedBubble(Bubble) + setExpanded(true)
		*/
		@Deprecated
		void setExpandedBubble(String key) {
		Bubble bubbleToExpand = mBubbleData.getBubbleWithKey(key);
		if (bubbleToExpand != null) {
		setSelectedBubble(bubbleToExpand);
		bubbleToExpand.setShowInShade(false);
		setExpanded(true);
		}
		}

		// via BubbleData.Listener
		void addBubble(Bubble bubble) {
		if (DEBUG_BUBBLE_STACK_VIEW) {

+1 −2

Original line number	Diff line number	Diff line
		@@ -356,8 +356,7 @@ public class BubbleControllerTest extends SysuiTestCase {

		// Switch which bubble is expanded
		mBubbleController.selectBubble(mRow.getEntry().getKey());
		stackView.setExpandedBubble(mRow.getEntry().getKey());
		assertEquals(mRow.getEntry(), stackView.getExpandedBubble().getEntry());
		mBubbleController.expandStack();
		assertTrue(mBubbleController.isBubbleNotificationSuppressedFromShade(
		mRow.getEntry().getKey()));