Merge "Show bubble by default when stack expands" into rvc-dev am: d668678adb am: 9efa5f75a8

Change-Id: I4768c4f59af4ab775148d778fca4660a04360b1e
This commit is contained in:
Lyn Han
2020-05-07 20:19:58 +00:00
committed by Automerger Merge Worker

View File

@@ -454,7 +454,6 @@ public class BubbleStackView extends FrameLayout
// that means overflow was previously expanded. Set the selected bubble // that means overflow was previously expanded. Set the selected bubble
// internally without going through BubbleData (which would ignore it since it's // internally without going through BubbleData (which would ignore it since it's
// already selected). // already selected).
mBubbleData.setShowingOverflow(true);
setSelectedBubble(clickedBubble); setSelectedBubble(clickedBubble);
} }
} else { } else {
@@ -1344,7 +1343,10 @@ public class BubbleStackView extends FrameLayout
} }
if (bubbleToSelect == null || bubbleToSelect.getKey() != BubbleOverflow.KEY) { if (bubbleToSelect == null || bubbleToSelect.getKey() != BubbleOverflow.KEY) {
mBubbleData.setShowingOverflow(false); mBubbleData.setShowingOverflow(false);
} else {
mBubbleData.setShowingOverflow(true);
} }
final BubbleViewProvider previouslySelected = mExpandedBubble; final BubbleViewProvider previouslySelected = mExpandedBubble;
mExpandedBubble = bubbleToSelect; mExpandedBubble = bubbleToSelect;
updatePointerPosition(); updatePointerPosition();