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

Merge "Null-check the dragged-out bubble." into rvc-dev am: 92d678d8ad

Browse Source 
Change-Id: Ic6368c61eb7e47140c7d5a0b2f89b217c6797fff
This commit is contained in:
TreeHugger Robot
2020-05-21 03:54:05 +00:00
committed by Automerger Merge Worker
parent e0b3613213 92d678d8ad
commit 87e02a263b
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -362,6 +362,10 @@ public class BubbleStackView extends FrameLayout
new MagnetizedObject.MagnetListener() { new MagnetizedObject.MagnetListener() {
@Override @Override
public void onStuckToTarget(@NonNull MagnetizedObject.MagneticTarget target) { public void onStuckToTarget(@NonNull MagnetizedObject.MagneticTarget target) {
if (mExpandedAnimationController.getDraggedOutBubble() == null) {
return;
}
animateDesaturateAndDarken( animateDesaturateAndDarken(
mExpandedAnimationController.getDraggedOutBubble(), true); mExpandedAnimationController.getDraggedOutBubble(), true);
} }
@@ -369,6 +373,10 @@ public class BubbleStackView extends FrameLayout
@Override @Override
public void onUnstuckFromTarget(@NonNull MagnetizedObject.MagneticTarget target, public void onUnstuckFromTarget(@NonNull MagnetizedObject.MagneticTarget target,
float velX, float velY, boolean wasFlungOut) { float velX, float velY, boolean wasFlungOut) {
if (mExpandedAnimationController.getDraggedOutBubble() == null) {
return;
}
animateDesaturateAndDarken( animateDesaturateAndDarken(
mExpandedAnimationController.getDraggedOutBubble(), false); mExpandedAnimationController.getDraggedOutBubble(), false);
@@ -383,6 +391,10 @@ public class BubbleStackView extends FrameLayout
@Override @Override
public void onReleasedInTarget(@NonNull MagnetizedObject.MagneticTarget target) { public void onReleasedInTarget(@NonNull MagnetizedObject.MagneticTarget target) {
if (mExpandedAnimationController.getDraggedOutBubble() == null) {
return;
}
mExpandedAnimationController.dismissDraggedOutBubble( mExpandedAnimationController.dismissDraggedOutBubble(
mExpandedAnimationController.getDraggedOutBubble() /* bubble */, mExpandedAnimationController.getDraggedOutBubble() /* bubble */,
mDismissTargetContainer.getHeight() /* translationYBy */, mDismissTargetContainer.getHeight() /* translationYBy */,