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 am: 87e02a263b

Browse Source 
Change-Id: Iecc3a09f3f15bc04c5d19ae88717f720eeff3fd6
This commit is contained in:
TreeHugger Robot
2020-05-21 04:10:03 +00:00
committed by Automerger Merge Worker
parent b1eb72b140 87e02a263b
commit c7dc5795ed
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() {
@Override
public void onStuckToTarget(@NonNull MagnetizedObject.MagneticTarget target) {
if (mExpandedAnimationController.getDraggedOutBubble() == null) {
return;
}
animateDesaturateAndDarken(
mExpandedAnimationController.getDraggedOutBubble(), true);
}
@@ -369,6 +373,10 @@ public class BubbleStackView extends FrameLayout
@Override
public void onUnstuckFromTarget(@NonNull MagnetizedObject.MagneticTarget target,
float velX, float velY, boolean wasFlungOut) {
if (mExpandedAnimationController.getDraggedOutBubble() == null) {
return;
}
animateDesaturateAndDarken(
mExpandedAnimationController.getDraggedOutBubble(), false);
@@ -383,6 +391,10 @@ public class BubbleStackView extends FrameLayout
@Override
public void onReleasedInTarget(@NonNull MagnetizedObject.MagneticTarget target) {
if (mExpandedAnimationController.getDraggedOutBubble() == null) {
return;
}
mExpandedAnimationController.dismissDraggedOutBubble(
mExpandedAnimationController.getDraggedOutBubble() /* bubble */,
mDismissTargetContainer.getHeight() /* translationYBy */,