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

Merge "Fix possible NPE" into sc-v2-dev am: d76f9c199c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16603090

Change-Id: I50140f087019333fc4ca5b3668cddc20a2ead3b9
This commit is contained in:
Mady Mellor
2022-01-11 17:53:27 +00:00
committed by Automerger Merge Worker
parent 72f49a1a3d d76f9c199c
commit 04b46aed49
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleFlyoutView.java
View File

@@ -231,8 +231,9 @@ public class BubbleFlyoutView extends FrameLayout {
* Fade animation for consecutive flyouts. * Fade animation for consecutive flyouts.
*/ */
void animateUpdate(Bubble.FlyoutMessage flyoutMessage, PointF stackPos, void animateUpdate(Bubble.FlyoutMessage flyoutMessage, PointF stackPos,
boolean hideDot, Runnable onHide) { boolean hideDot, float[] dotCenter, Runnable onHide) {
mOnHide = onHide; mOnHide = onHide;
mDotCenter = dotCenter;
final Runnable afterFadeOut = () -> { final Runnable afterFadeOut = () -> {
updateFlyoutMessage(flyoutMessage); updateFlyoutMessage(flyoutMessage);
// Wait for TextViews to layout with updated height. // Wait for TextViews to layout with updated height.

1
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java
View File

@@ -2494,6 +2494,7 @@ public class BubbleStackView extends FrameLayout
if (mFlyout.getVisibility() == View.VISIBLE) { if (mFlyout.getVisibility() == View.VISIBLE) {
mFlyout.animateUpdate(bubble.getFlyoutMessage(), mFlyout.animateUpdate(bubble.getFlyoutMessage(),
mStackAnimationController.getStackPosition(), !bubble.showDot(), mStackAnimationController.getStackPosition(), !bubble.showDot(),
bubble.getIconView().getDotCenter(),
mAfterFlyoutHidden /* onHide */); mAfterFlyoutHidden /* onHide */);
} else { } else {
mFlyout.setVisibility(INVISIBLE); mFlyout.setVisibility(INVISIBLE);