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

Merge "Null-check the desaturating view, it might be gone." into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-05 17:47:08 +00:00
committed by Android (Google) Code Review
parent 52bcedf56a 8d35a119d0
commit b19c92dcdd
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -270,7 +270,7 @@ public class BubbleStackView extends FrameLayout
private boolean mShowingDismiss = false; private boolean mShowingDismiss = false;
/** The view to desaturate/darken when magneted to the dismiss target. */ /** The view to desaturate/darken when magneted to the dismiss target. */
private View mDesaturateAndDarkenTargetView; @Nullable private View mDesaturateAndDarkenTargetView;
private LayoutInflater mInflater; private LayoutInflater mInflater;
@@ -908,7 +908,10 @@ public class BubbleStackView extends FrameLayout
// Update the paint and apply it to the bubble container. // Update the paint and apply it to the bubble container.
mDesaturateAndDarkenPaint.setColorFilter(new ColorMatrixColorFilter(animatedMatrix)); mDesaturateAndDarkenPaint.setColorFilter(new ColorMatrixColorFilter(animatedMatrix));
mDesaturateAndDarkenTargetView.setLayerPaint(mDesaturateAndDarkenPaint);
if (mDesaturateAndDarkenTargetView != null) {
mDesaturateAndDarkenTargetView.setLayerPaint(mDesaturateAndDarkenPaint);
}
}); });
// If the stack itself is touched, it means none of its touchable views (bubbles, flyouts, // If the stack itself is touched, it means none of its touchable views (bubbles, flyouts,
@@ -1894,6 +1897,10 @@ public class BubbleStackView extends FrameLayout
private void animateDesaturateAndDarken(View targetView, boolean desaturateAndDarken) { private void animateDesaturateAndDarken(View targetView, boolean desaturateAndDarken) {
mDesaturateAndDarkenTargetView = targetView; mDesaturateAndDarkenTargetView = targetView;
if (mDesaturateAndDarkenTargetView == null) {
return;
}
if (desaturateAndDarken) { if (desaturateAndDarken) {
// Use the animated paint for the bubbles. // Use the animated paint for the bubbles.
mDesaturateAndDarkenTargetView.setLayerType( mDesaturateAndDarkenTargetView.setLayerType(
@@ -1915,9 +1922,14 @@ public class BubbleStackView extends FrameLayout
} }
private void resetDesaturationAndDarken() { private void resetDesaturationAndDarken() {
mDesaturateAndDarkenAnimator.removeAllListeners(); mDesaturateAndDarkenAnimator.removeAllListeners();
mDesaturateAndDarkenAnimator.cancel(); mDesaturateAndDarkenAnimator.cancel();
mDesaturateAndDarkenTargetView.setLayerType(View.LAYER_TYPE_NONE, null);
if (mDesaturateAndDarkenTargetView != null) {
mDesaturateAndDarkenTargetView.setLayerType(View.LAYER_TYPE_NONE, null);
mDesaturateAndDarkenTargetView = null;
}
} }
/** Animates in the dismiss target. */ /** Animates in the dismiss target. */