Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove some unused / deprecated code"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-01-16 13:25:08 +00:00
committed by Android (Google) Code Review
parent feb86eae2e 881d2ec38a
commit 064c79eebb
2 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
View File

@@ -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) {

3
packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleControllerTest.java
View File

@@ -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()));