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

Merge "Improves pointer positioning & remove no-op when expanding"

Browse Source
This commit is contained in:
Mady Mellor
2019-01-30 15:53:24 +00:00
committed by Android (Google) Code Review
parent 1e247e6511 de2d4d2164
commit 726a57bd78
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -238,14 +238,14 @@ public class BubbleStackView extends FrameLayout implements BubbleTouchHandler.F
*/
public void setExpandedBubble(BubbleView bubbleToExpand) {
mExpandedBubble = bubbleToExpand;
boolean prevExpanded = mIsExpanded;
mIsExpanded = true;
if (!prevExpanded) {
if (!mIsExpanded) {
// If we weren't previously expanded we should animate open.
animateExpansion(true /* expand */);
} else {
// If we were expanded just update the views
// Otherwise just update the views
// TODO: probably animate / page to expanded one
updateExpandedBubble();
updatePointerPosition();
requestUpdate();
}
mExpandedBubble.getEntry().setShowInShadeWhenBubble(false);
@@ -387,7 +387,6 @@ public class BubbleStackView extends FrameLayout implements BubbleTouchHandler.F
mIsExpanded = shouldExpand;
updateExpandedBubble();
applyCurrentState();
//requestUpdate();
mIsAnimating = true;
@@ -400,7 +399,10 @@ public class BubbleStackView extends FrameLayout implements BubbleTouchHandler.F
if (shouldExpand) {
mBubbleContainer.setController(mExpandedAnimationController);
mExpandedAnimationController.expandFromStack(
mStackAnimationController.getStackPosition(), updateAfter);
mStackAnimationController.getStackPosition(), () -> {
updatePointerPosition();
updateAfter.run();
});
} else {
mBubbleContainer.cancelAllAnimations();
mExpandedAnimationController.collapseBackToStack(
@@ -649,10 +651,7 @@ public class BubbleStackView extends FrameLayout implements BubbleTouchHandler.F
}
// Bubble with notification as expanded state doesn't need a header / title
mExpandedViewContainer.setHeaderText(null);
}
float pointerPosition = mExpandedBubble.getPosition().x + (mExpandedBubble.getWidth() / 2);
mExpandedViewContainer.setPointerPosition((int) pointerPosition);
}
private void applyCurrentState() {
@@ -690,6 +689,14 @@ public class BubbleStackView extends FrameLayout implements BubbleTouchHandler.F
}
}
private void updatePointerPosition() {
if (mExpandedBubble != null) {
float pointerPosition = mExpandedBubble.getPosition().x
+ (mExpandedBubble.getWidth() / 2f);
mExpandedViewContainer.setPointerPosition((int) pointerPosition);
}
}
private void applyRowState(ExpandableNotificationRow view) {
view.reset();
view.setHeadsUp(false);