Remove background drawing behind notifications
- NSSL: remove continuous background clipping, drawing, animating - NotificationSection: remove bounds math - AmbientState: remove unused state Bug: 171817112 Test: background clear for new and old dismissal Test: half-swipe, full-swipe, longpress on ls/hun/shade notifs; close and open shade from ls and home; open shade after hun; no regressions Change-Id: I9d7cb245542a03a526808ad8ed28763719ed4972
This commit is contained in:
Lyn Han
@@ -357,9 +357,6 @@
|
||||
the notification is not swiped enough to dismiss it. -->
|
||||
<bool name="config_showNotificationGear">true</bool>
|
||||
|
||||
<!-- Whether or not a background should be drawn behind a notification. -->
|
||||
<bool name="config_drawNotificationBackground">true</bool>
|
||||
|
||||
<!-- Whether or the notifications can be shown and dismissed with a drag. -->
|
||||
<bool name="config_enableNotificationShadeDrag">true</bool>
|
||||
|
||||
|
||||
@@ -82,9 +82,6 @@ public class AmbientState {
|
||||
private ExpandableNotificationRow mTrackedHeadsUpRow;
|
||||
private float mAppearFraction;
|
||||
|
||||
/** Tracks the state from AlertingNotificationManager#hasNotifications() */
|
||||
private boolean mHasAlertEntries;
|
||||
|
||||
public AmbientState(
|
||||
Context context,
|
||||
@NonNull SectionProvider sectionProvider) {
|
||||
@@ -368,21 +365,10 @@ public class AmbientState {
|
||||
mPanelTracking = panelTracking;
|
||||
}
|
||||
|
||||
public boolean hasPulsingNotifications() {
|
||||
return mPulsing && mHasAlertEntries;
|
||||
}
|
||||
|
||||
public void setPulsing(boolean hasPulsing) {
|
||||
mPulsing = hasPulsing;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return if we're pulsing in general
|
||||
*/
|
||||
public boolean isPulsing() {
|
||||
return mPulsing;
|
||||
}
|
||||
|
||||
public boolean isPulsing(NotificationEntry entry) {
|
||||
return mPulsing && entry.isAlerting();
|
||||
}
|
||||
@@ -541,8 +527,4 @@ public class AmbientState {
|
||||
public float getAppearFraction() {
|
||||
return mAppearFraction;
|
||||
}
|
||||
|
||||
public void setHasAlertEntries(boolean hasAlertEntries) {
|
||||
mHasAlertEntries = hasAlertEntries;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,175 +31,22 @@ import com.android.systemui.statusbar.notification.ShadeViewRefactor;
|
||||
import com.android.systemui.statusbar.notification.row.ExpandableView;
|
||||
|
||||
/**
|
||||
* Represents the bounds of a section of the notification shade and handles animation when the
|
||||
* bounds change.
|
||||
* Represents the priority of a notification section and tracks first and last visible children.
|
||||
*/
|
||||
public class NotificationSection {
|
||||
private @PriorityBucket int mBucket;
|
||||
private View mOwningView;
|
||||
private Rect mBounds = new Rect();
|
||||
private Rect mCurrentBounds = new Rect(-1, -1, -1, -1);
|
||||
private Rect mStartAnimationRect = new Rect();
|
||||
private Rect mEndAnimationRect = new Rect();
|
||||
private ObjectAnimator mTopAnimator = null;
|
||||
private ObjectAnimator mBottomAnimator = null;
|
||||
private ExpandableView mFirstVisibleChild;
|
||||
private ExpandableView mLastVisibleChild;
|
||||
|
||||
NotificationSection(View owningView, @PriorityBucket int bucket) {
|
||||
mOwningView = owningView;
|
||||
NotificationSection(@PriorityBucket int bucket) {
|
||||
mBucket = bucket;
|
||||
}
|
||||
|
||||
public void cancelAnimators() {
|
||||
if (mBottomAnimator != null) {
|
||||
mBottomAnimator.cancel();
|
||||
}
|
||||
if (mTopAnimator != null) {
|
||||
mTopAnimator.cancel();
|
||||
}
|
||||
}
|
||||
|
||||
public Rect getCurrentBounds() {
|
||||
return mCurrentBounds;
|
||||
}
|
||||
|
||||
public Rect getBounds() {
|
||||
return mBounds;
|
||||
}
|
||||
|
||||
public boolean didBoundsChange() {
|
||||
return !mCurrentBounds.equals(mBounds);
|
||||
}
|
||||
|
||||
public boolean areBoundsAnimating() {
|
||||
return mBottomAnimator != null || mTopAnimator != null;
|
||||
}
|
||||
|
||||
@PriorityBucket
|
||||
public int getBucket() {
|
||||
return mBucket;
|
||||
}
|
||||
|
||||
public void startBackgroundAnimation(boolean animateTop, boolean animateBottom) {
|
||||
// Left and right bounds are always applied immediately.
|
||||
mCurrentBounds.left = mBounds.left;
|
||||
mCurrentBounds.right = mBounds.right;
|
||||
startBottomAnimation(animateBottom);
|
||||
startTopAnimation(animateTop);
|
||||
}
|
||||
|
||||
|
||||
@ShadeViewRefactor(ShadeViewRefactor.RefactorComponent.STATE_RESOLVER)
|
||||
private void startTopAnimation(boolean animate) {
|
||||
int previousEndValue = mEndAnimationRect.top;
|
||||
int newEndValue = mBounds.top;
|
||||
ObjectAnimator previousAnimator = mTopAnimator;
|
||||
if (previousAnimator != null && previousEndValue == newEndValue) {
|
||||
return;
|
||||
}
|
||||
if (!animate) {
|
||||
// just a local update was performed
|
||||
if (previousAnimator != null) {
|
||||
// we need to increase all animation keyframes of the previous animator by the
|
||||
// relative change to the end value
|
||||
int previousStartValue = mStartAnimationRect.top;
|
||||
PropertyValuesHolder[] values = previousAnimator.getValues();
|
||||
values[0].setIntValues(previousStartValue, newEndValue);
|
||||
mStartAnimationRect.top = previousStartValue;
|
||||
mEndAnimationRect.top = newEndValue;
|
||||
previousAnimator.setCurrentPlayTime(previousAnimator.getCurrentPlayTime());
|
||||
return;
|
||||
} else {
|
||||
// no new animation needed, let's just apply the value
|
||||
setBackgroundTop(newEndValue);
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (previousAnimator != null) {
|
||||
previousAnimator.cancel();
|
||||
}
|
||||
ObjectAnimator animator = ObjectAnimator.ofInt(this, "backgroundTop",
|
||||
mCurrentBounds.top, newEndValue);
|
||||
Interpolator interpolator = Interpolators.FAST_OUT_SLOW_IN;
|
||||
animator.setInterpolator(interpolator);
|
||||
animator.setDuration(StackStateAnimator.ANIMATION_DURATION_STANDARD);
|
||||
// remove the tag when the animation is finished
|
||||
animator.addListener(new AnimatorListenerAdapter() {
|
||||
@Override
|
||||
public void onAnimationEnd(Animator animation) {
|
||||
mStartAnimationRect.top = -1;
|
||||
mEndAnimationRect.top = -1;
|
||||
mTopAnimator = null;
|
||||
}
|
||||
});
|
||||
animator.start();
|
||||
mStartAnimationRect.top = mCurrentBounds.top;
|
||||
mEndAnimationRect.top = newEndValue;
|
||||
mTopAnimator = animator;
|
||||
}
|
||||
|
||||
@ShadeViewRefactor(ShadeViewRefactor.RefactorComponent.STATE_RESOLVER)
|
||||
private void startBottomAnimation(boolean animate) {
|
||||
int previousStartValue = mStartAnimationRect.bottom;
|
||||
int previousEndValue = mEndAnimationRect.bottom;
|
||||
int newEndValue = mBounds.bottom;
|
||||
ObjectAnimator previousAnimator = mBottomAnimator;
|
||||
if (previousAnimator != null && previousEndValue == newEndValue) {
|
||||
return;
|
||||
}
|
||||
if (!animate) {
|
||||
// just a local update was performed
|
||||
if (previousAnimator != null) {
|
||||
// we need to increase all animation keyframes of the previous animator by the
|
||||
// relative change to the end value
|
||||
PropertyValuesHolder[] values = previousAnimator.getValues();
|
||||
values[0].setIntValues(previousStartValue, newEndValue);
|
||||
mStartAnimationRect.bottom = previousStartValue;
|
||||
mEndAnimationRect.bottom = newEndValue;
|
||||
previousAnimator.setCurrentPlayTime(previousAnimator.getCurrentPlayTime());
|
||||
return;
|
||||
} else {
|
||||
// no new animation needed, let's just apply the value
|
||||
setBackgroundBottom(newEndValue);
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (previousAnimator != null) {
|
||||
previousAnimator.cancel();
|
||||
}
|
||||
ObjectAnimator animator = ObjectAnimator.ofInt(this, "backgroundBottom",
|
||||
mCurrentBounds.bottom, newEndValue);
|
||||
Interpolator interpolator = Interpolators.FAST_OUT_SLOW_IN;
|
||||
animator.setInterpolator(interpolator);
|
||||
animator.setDuration(StackStateAnimator.ANIMATION_DURATION_STANDARD);
|
||||
// remove the tag when the animation is finished
|
||||
animator.addListener(new AnimatorListenerAdapter() {
|
||||
@Override
|
||||
public void onAnimationEnd(Animator animation) {
|
||||
mStartAnimationRect.bottom = -1;
|
||||
mEndAnimationRect.bottom = -1;
|
||||
mBottomAnimator = null;
|
||||
}
|
||||
});
|
||||
animator.start();
|
||||
mStartAnimationRect.bottom = mCurrentBounds.bottom;
|
||||
mEndAnimationRect.bottom = newEndValue;
|
||||
mBottomAnimator = animator;
|
||||
}
|
||||
|
||||
@ShadeViewRefactor(ShadeViewRefactor.RefactorComponent.SHADE_VIEW)
|
||||
private void setBackgroundTop(int top) {
|
||||
mCurrentBounds.top = top;
|
||||
mOwningView.invalidate();
|
||||
}
|
||||
|
||||
@ShadeViewRefactor(ShadeViewRefactor.RefactorComponent.SHADE_VIEW)
|
||||
private void setBackgroundBottom(int bottom) {
|
||||
mCurrentBounds.bottom = bottom;
|
||||
mOwningView.invalidate();
|
||||
}
|
||||
|
||||
public ExpandableView getFirstVisibleChild() {
|
||||
return mFirstVisibleChild;
|
||||
}
|
||||
@@ -219,93 +66,4 @@ public class NotificationSection {
|
||||
mLastVisibleChild = child;
|
||||
return changed;
|
||||
}
|
||||
|
||||
public void resetCurrentBounds() {
|
||||
mCurrentBounds.set(mBounds);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if {@code top} is equal to the top of this section (if not currently animating)
|
||||
* or where the top of this section will be when animation completes.
|
||||
*/
|
||||
public boolean isTargetTop(int top) {
|
||||
return (mTopAnimator == null && mCurrentBounds.top == top)
|
||||
|| (mTopAnimator != null && mEndAnimationRect.top == top);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if {@code bottom} is equal to the bottom of this section (if not currently
|
||||
* animating) or where the bottom of this section will be when animation completes.
|
||||
*/
|
||||
public boolean isTargetBottom(int bottom) {
|
||||
return (mBottomAnimator == null && mCurrentBounds.bottom == bottom)
|
||||
|| (mBottomAnimator != null && mEndAnimationRect.bottom == bottom);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the bounds of this section based on it's views
|
||||
*
|
||||
* @param minTopPosition the minimum position that the top needs to have
|
||||
* @param minBottomPosition the minimum position that the bottom needs to have
|
||||
* @return the position of the new bottom
|
||||
*/
|
||||
public int updateBounds(int minTopPosition, int minBottomPosition,
|
||||
boolean shiftBackgroundWithFirst) {
|
||||
int top = minTopPosition;
|
||||
int bottom = minTopPosition;
|
||||
ExpandableView firstView = getFirstVisibleChild();
|
||||
if (firstView != null) {
|
||||
// Round Y up to avoid seeing the background during animation
|
||||
int finalTranslationY = (int) Math.ceil(ViewState.getFinalTranslationY(firstView));
|
||||
// TODO: look into the already animating part
|
||||
int newTop;
|
||||
if (isTargetTop(finalTranslationY)) {
|
||||
// we're ending up at the same location as we are now, let's just skip the
|
||||
// animation
|
||||
newTop = finalTranslationY;
|
||||
} else {
|
||||
newTop = (int) Math.ceil(firstView.getTranslationY());
|
||||
}
|
||||
top = Math.max(newTop, top);
|
||||
if (firstView.showingPulsing()) {
|
||||
// If we're pulsing, the notification can actually go below!
|
||||
bottom = Math.max(bottom, finalTranslationY
|
||||
+ ExpandableViewState.getFinalActualHeight(firstView));
|
||||
if (shiftBackgroundWithFirst) {
|
||||
mBounds.left += Math.max(firstView.getTranslation(), 0);
|
||||
mBounds.right += Math.min(firstView.getTranslation(), 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
top = Math.max(minTopPosition, top);
|
||||
ExpandableView lastView = getLastVisibleChild();
|
||||
if (lastView != null) {
|
||||
float finalTranslationY = ViewState.getFinalTranslationY(lastView);
|
||||
int finalHeight = ExpandableViewState.getFinalActualHeight(lastView);
|
||||
// Round Y down to avoid seeing the background during animation
|
||||
int finalBottom = (int) Math.floor(
|
||||
finalTranslationY + finalHeight - lastView.getClipBottomAmount());
|
||||
int newBottom;
|
||||
if (isTargetBottom(finalBottom)) {
|
||||
// we're ending up at the same location as we are now, lets just skip the animation
|
||||
newBottom = finalBottom;
|
||||
} else {
|
||||
newBottom = (int) (lastView.getTranslationY() + lastView.getActualHeight()
|
||||
- lastView.getClipBottomAmount());
|
||||
// The background can never be lower than the end of the last view
|
||||
minBottomPosition = (int) Math.min(
|
||||
lastView.getTranslationY() + lastView.getActualHeight(),
|
||||
minBottomPosition);
|
||||
}
|
||||
bottom = Math.max(bottom, Math.max(newBottom, minBottomPosition));
|
||||
}
|
||||
bottom = Math.max(top, bottom);
|
||||
mBounds.top = top;
|
||||
mBounds.bottom = bottom;
|
||||
return bottom;
|
||||
}
|
||||
|
||||
public boolean needsBackground() {
|
||||
return mFirstVisibleChild != null && mBucket != BUCKET_MEDIA_CONTROLS;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -126,7 +126,7 @@ class NotificationSectionsManager @Inject internal constructor(
|
||||
|
||||
fun createSectionsForBuckets(): Array<NotificationSection> =
|
||||
sectionsFeatureManager.getNotificationBuckets()
|
||||
.map { NotificationSection(parent, it) }
|
||||
.map { NotificationSection(it) }
|
||||
.toTypedArray()
|
||||
|
||||
/**
|
||||
|
||||
@@ -38,12 +38,9 @@ import android.content.Intent;
|
||||
import android.content.res.Configuration;
|
||||
import android.content.res.Resources;
|
||||
import android.graphics.Canvas;
|
||||
import android.graphics.Color;
|
||||
import android.graphics.Outline;
|
||||
import android.graphics.Paint;
|
||||
import android.graphics.PointF;
|
||||
import android.graphics.PorterDuff;
|
||||
import android.graphics.PorterDuffXfermode;
|
||||
import android.graphics.Rect;
|
||||
import android.os.Bundle;
|
||||
import android.os.UserHandle;
|
||||
@@ -73,7 +70,6 @@ import android.widget.OverScroller;
|
||||
import android.widget.ScrollView;
|
||||
|
||||
import com.android.internal.annotations.VisibleForTesting;
|
||||
import com.android.internal.graphics.ColorUtils;
|
||||
import com.android.internal.jank.InteractionJankMonitor;
|
||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
import com.android.keyguard.KeyguardSliceView;
|
||||
@@ -158,8 +154,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
private ExpandHelper mExpandHelper;
|
||||
private NotificationSwipeHelper mSwipeHelper;
|
||||
private int mCurrentStackHeight = Integer.MAX_VALUE;
|
||||
private final Paint mBackgroundPaint = new Paint();
|
||||
private final boolean mShouldDrawNotificationBackground;
|
||||
private boolean mHighPriorityBeforeSpeedBump;
|
||||
private boolean mDismissRtl;
|
||||
|
||||
@@ -258,7 +252,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
protected FooterView mFooterView;
|
||||
protected EmptyShadeView mEmptyShadeView;
|
||||
private boolean mDismissAllInProgress;
|
||||
private boolean mFadeNotificationsOnDismiss;
|
||||
private FooterDismissListener mFooterDismissListener;
|
||||
private boolean mFlingAfterUpEvent;
|
||||
|
||||
@@ -328,10 +321,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
}
|
||||
};
|
||||
private NotificationSection[] mSections;
|
||||
private boolean mAnimateNextBackgroundTop;
|
||||
private boolean mAnimateNextBackgroundBottom;
|
||||
private boolean mAnimateNextSectionBoundsChange;
|
||||
private int mBgColor;
|
||||
private float mDimAmount;
|
||||
private ValueAnimator mDimAnimator;
|
||||
private ArrayList<ExpandableView> mTmpSortedChildren = new ArrayList<>();
|
||||
@@ -342,25 +331,14 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
}
|
||||
};
|
||||
private ValueAnimator.AnimatorUpdateListener mDimUpdateListener
|
||||
= new ValueAnimator.AnimatorUpdateListener() {
|
||||
|
||||
@Override
|
||||
public void onAnimationUpdate(ValueAnimator animation) {
|
||||
setDimAmount((Float) animation.getAnimatedValue());
|
||||
}
|
||||
};
|
||||
= animation -> setDimAmount((Float) animation.getAnimatedValue());
|
||||
protected ViewGroup mQsContainer;
|
||||
private boolean mContinuousShadowUpdate;
|
||||
private boolean mContinuousBackgroundUpdate;
|
||||
private ViewTreeObserver.OnPreDrawListener mShadowUpdater
|
||||
= () -> {
|
||||
updateViewShadows();
|
||||
return true;
|
||||
};
|
||||
private ViewTreeObserver.OnPreDrawListener mBackgroundUpdater = () -> {
|
||||
updateBackground();
|
||||
return true;
|
||||
};
|
||||
private Comparator<ExpandableView> mViewPositionComparator = (view, otherView) -> {
|
||||
float endY = view.getTranslationY() + view.getActualHeight();
|
||||
float otherEndY = otherView.getTranslationY() + otherView.getActualHeight();
|
||||
@@ -379,7 +357,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
if (mAmbientState.isHiddenAtAll()) {
|
||||
float xProgress = mHideXInterpolator.getInterpolation(
|
||||
(1 - mLinearHideAmount) * mBackgroundXFactor);
|
||||
outline.setRoundRect(mBackgroundAnimationRect,
|
||||
outline.setRoundRect(mOutlineAnimationRect,
|
||||
MathUtils.lerp(mCornerRadius / 2.0f, mCornerRadius,
|
||||
xProgress));
|
||||
outline.setAlpha(1.0f - mAmbientState.getHideAmount());
|
||||
@@ -388,7 +366,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
}
|
||||
}
|
||||
};
|
||||
private PorterDuffXfermode mSrcMode = new PorterDuffXfermode(PorterDuff.Mode.SRC);
|
||||
private boolean mPulsing;
|
||||
private boolean mScrollable;
|
||||
private View mForcedScroll;
|
||||
@@ -422,7 +399,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
private boolean mInHeadsUpPinnedMode;
|
||||
private boolean mHeadsUpAnimatingAway;
|
||||
private int mStatusBarState;
|
||||
private int mCachedBackgroundColor;
|
||||
private boolean mHeadsUpGoingAwayAnimationsAllowed = true;
|
||||
private Runnable mReflingAndAnimateScroll = () -> {
|
||||
if (ANCHOR_SCROLLING) {
|
||||
@@ -432,7 +408,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
};
|
||||
private int mCornerRadius;
|
||||
private int mSidePaddings;
|
||||
private final Rect mBackgroundAnimationRect = new Rect();
|
||||
private final Rect mOutlineAnimationRect = new Rect();
|
||||
private ArrayList<BiConsumer<Float, Float>> mExpandedHeightListeners = new ArrayList<>();
|
||||
private int mHeadsUpInset;
|
||||
private HeadsUpAppearanceController mHeadsUpAppearanceController;
|
||||
@@ -452,7 +428,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
|
||||
private final NotificationSectionsManager mSectionsManager;
|
||||
private ForegroundServiceDungeonView mFgsSectionView;
|
||||
private boolean mAnimateBottomOnLayout;
|
||||
private float mLastSentAppear;
|
||||
private float mLastSentExpandedHeight;
|
||||
private boolean mWillExpand;
|
||||
@@ -463,7 +438,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
|
||||
private boolean mKeyguardMediaControllorVisible;
|
||||
private NotificationEntry mTopHeadsUpEntry;
|
||||
private long mNumHeadsUp;
|
||||
private NotificationStackScrollLayoutController.TouchHandler mTouchHandler;
|
||||
|
||||
private final ExpandableView.OnHeightChangedListener mOnChildHeightChangedListener =
|
||||
@@ -530,7 +504,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
mSections = mSectionsManager.createSectionsForBuckets();
|
||||
|
||||
mAmbientState = new AmbientState(context, mSectionsManager);
|
||||
mBgColor = context.getColor(R.color.notification_shade_background_color);
|
||||
int minHeight = res.getDimensionPixelSize(R.dimen.notification_min_height);
|
||||
int maxHeight = res.getDimensionPixelSize(R.dimen.notification_max_height);
|
||||
mExpandHelper = new ExpandHelper(getContext(), mExpandHelperCallback,
|
||||
@@ -539,13 +512,9 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
mExpandHelper.setScrollAdapter(mScrollAdapter);
|
||||
|
||||
mStackScrollAlgorithm = createStackScrollAlgorithm(context);
|
||||
mShouldDrawNotificationBackground =
|
||||
res.getBoolean(R.bool.config_drawNotificationBackground);
|
||||
setOutlineProvider(mOutlineProvider);
|
||||
|
||||
boolean willDraw = mShouldDrawNotificationBackground || DEBUG;
|
||||
setWillNotDraw(!willDraw);
|
||||
mBackgroundPaint.setAntiAlias(true);
|
||||
setWillNotDraw(!DEBUG);
|
||||
if (DEBUG) {
|
||||
mDebugPaint = new Paint();
|
||||
mDebugPaint.setColor(0xffff0000);
|
||||
@@ -590,7 +559,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
* @return the height at which we will wake up when pulsing
|
||||
*/
|
||||
public float getWakeUpHeight() {
|
||||
ExpandableView firstChild = getFirstChildWithBackground();
|
||||
ExpandableView firstChild = getFirstExpandableView();
|
||||
if (firstChild != null) {
|
||||
if (mKeyguardBypassEnabledProvider.getBypassEnabled()) {
|
||||
return firstChild.getHeadsUpHeightWithoutHeader();
|
||||
@@ -641,22 +610,11 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
}
|
||||
|
||||
void updateBgColor() {
|
||||
mBgColor = mContext.getColor(R.color.notification_shade_background_color);
|
||||
updateBackgroundDimming();
|
||||
mShelf.onUiModeChanged();
|
||||
}
|
||||
|
||||
@ShadeViewRefactor(RefactorComponent.DECORATOR)
|
||||
protected void onDraw(Canvas canvas) {
|
||||
if (mShouldDrawNotificationBackground
|
||||
&& (mSections[0].getCurrentBounds().top
|
||||
< mSections[mSections.length - 1].getCurrentBounds().bottom
|
||||
|| mAmbientState.isDozing())) {
|
||||
drawBackground(canvas);
|
||||
} else if (mInHeadsUpPinnedMode || mHeadsUpAnimatingAway) {
|
||||
drawHeadsUpBackground(canvas);
|
||||
}
|
||||
|
||||
if (DEBUG) {
|
||||
int y = mTopPadding;
|
||||
canvas.drawLine(0, y, getWidth(), y, mDebugPaint);
|
||||
@@ -691,160 +649,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
}
|
||||
}
|
||||
|
||||
@ShadeViewRefactor(RefactorComponent.DECORATOR)
|
||||
private void drawBackground(Canvas canvas) {
|
||||
int lockScreenLeft = mSidePaddings;
|
||||
int lockScreenRight = getWidth() - mSidePaddings;
|
||||
int lockScreenTop = mSections[0].getCurrentBounds().top;
|
||||
int lockScreenBottom = mSections[mSections.length - 1].getCurrentBounds().bottom;
|
||||
int hiddenLeft = getWidth() / 2;
|
||||
int hiddenTop = mTopPadding;
|
||||
|
||||
float yProgress = 1 - mInterpolatedHideAmount;
|
||||
float xProgress = mHideXInterpolator.getInterpolation(
|
||||
(1 - mLinearHideAmount) * mBackgroundXFactor);
|
||||
|
||||
int left = (int) MathUtils.lerp(hiddenLeft, lockScreenLeft, xProgress);
|
||||
int right = (int) MathUtils.lerp(hiddenLeft, lockScreenRight, xProgress);
|
||||
int top = (int) MathUtils.lerp(hiddenTop, lockScreenTop, yProgress);
|
||||
int bottom = (int) MathUtils.lerp(hiddenTop, lockScreenBottom, yProgress);
|
||||
mBackgroundAnimationRect.set(
|
||||
left,
|
||||
top,
|
||||
right,
|
||||
bottom);
|
||||
|
||||
int backgroundTopAnimationOffset = top - lockScreenTop;
|
||||
// TODO(kprevas): this may not be necessary any more since we don't display the shelf in AOD
|
||||
boolean anySectionHasVisibleChild = false;
|
||||
for (NotificationSection section : mSections) {
|
||||
if (section.needsBackground()) {
|
||||
anySectionHasVisibleChild = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
boolean shouldDrawBackground;
|
||||
if (mKeyguardBypassEnabledProvider.getBypassEnabled() && onKeyguard()) {
|
||||
shouldDrawBackground = isPulseExpanding();
|
||||
} else {
|
||||
shouldDrawBackground = !mAmbientState.isDozing() || anySectionHasVisibleChild;
|
||||
}
|
||||
if (shouldDrawBackground) {
|
||||
drawBackgroundRects(canvas, left, right, top, backgroundTopAnimationOffset);
|
||||
}
|
||||
|
||||
updateClipping();
|
||||
}
|
||||
|
||||
/**
|
||||
* Draws round rects for each background section.
|
||||
*
|
||||
* We want to draw a round rect for each background section as defined by {@link #mSections}.
|
||||
* However, if two sections are directly adjacent with no gap between them (e.g. on the
|
||||
* lockscreen where the shelf can appear directly below the high priority section, or while
|
||||
* scrolling the shade so that the top of the shelf is right at the bottom of the high priority
|
||||
* section), we don't want to round the adjacent corners.
|
||||
*
|
||||
* Since {@link Canvas} doesn't provide a way to draw a half-rounded rect, this means that we
|
||||
* need to coalesce the backgrounds for adjacent sections and draw them as a single round rect.
|
||||
* This method tracks the top of each rect we need to draw, then iterates through the visible
|
||||
* sections. If a section is not adjacent to the previous section, we draw the previous rect
|
||||
* behind the sections we've accumulated up to that point, then start a new rect at the top of
|
||||
* the current section. When we're done iterating we will always have one rect left to draw.
|
||||
*/
|
||||
private void drawBackgroundRects(Canvas canvas, int left, int right, int top,
|
||||
int animationYOffset) {
|
||||
int backgroundRectTop = top;
|
||||
int lastSectionBottom =
|
||||
mSections[0].getCurrentBounds().bottom + animationYOffset;
|
||||
int currentLeft = left;
|
||||
int currentRight = right;
|
||||
boolean first = true;
|
||||
for (NotificationSection section : mSections) {
|
||||
if (!section.needsBackground()) {
|
||||
continue;
|
||||
}
|
||||
int sectionTop = section.getCurrentBounds().top + animationYOffset;
|
||||
int ownLeft = Math.min(Math.max(left, section.getCurrentBounds().left), right);
|
||||
int ownRight = Math.max(Math.min(right, section.getCurrentBounds().right), ownLeft);
|
||||
// If sections are directly adjacent to each other, we don't want to draw them
|
||||
// as separate roundrects, as the rounded corners right next to each other look
|
||||
// bad.
|
||||
if (sectionTop - lastSectionBottom > DISTANCE_BETWEEN_ADJACENT_SECTIONS_PX
|
||||
|| ((currentLeft != ownLeft || currentRight != ownRight) && !first)) {
|
||||
canvas.drawRoundRect(currentLeft,
|
||||
backgroundRectTop,
|
||||
currentRight,
|
||||
lastSectionBottom,
|
||||
mCornerRadius, mCornerRadius, mBackgroundPaint);
|
||||
backgroundRectTop = sectionTop;
|
||||
}
|
||||
currentLeft = ownLeft;
|
||||
currentRight = ownRight;
|
||||
lastSectionBottom =
|
||||
section.getCurrentBounds().bottom + animationYOffset;
|
||||
first = false;
|
||||
}
|
||||
canvas.drawRoundRect(currentLeft,
|
||||
backgroundRectTop,
|
||||
currentRight,
|
||||
lastSectionBottom,
|
||||
mCornerRadius, mCornerRadius, mBackgroundPaint);
|
||||
}
|
||||
|
||||
private void drawHeadsUpBackground(Canvas canvas) {
|
||||
int left = mSidePaddings;
|
||||
int right = getWidth() - mSidePaddings;
|
||||
|
||||
float top = getHeight();
|
||||
float bottom = 0;
|
||||
int childCount = getChildCount();
|
||||
for (int i = 0; i < childCount; i++) {
|
||||
View child = getChildAt(i);
|
||||
if (child.getVisibility() != View.GONE
|
||||
&& child instanceof ExpandableNotificationRow) {
|
||||
ExpandableNotificationRow row = (ExpandableNotificationRow) child;
|
||||
if ((row.isPinned() || row.isHeadsUpAnimatingAway()) && row.getTranslation() < 0
|
||||
&& row.getProvider().shouldShowGutsOnSnapOpen()) {
|
||||
top = Math.min(top, row.getTranslationY());
|
||||
bottom = Math.max(bottom, row.getTranslationY() + row.getActualHeight());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (top < bottom) {
|
||||
canvas.drawRoundRect(
|
||||
left, top, right, bottom,
|
||||
mCornerRadius, mCornerRadius, mBackgroundPaint);
|
||||
}
|
||||
}
|
||||
|
||||
@ShadeViewRefactor(RefactorComponent.SHADE_VIEW)
|
||||
void updateBackgroundDimming() {
|
||||
// No need to update the background color if it's not being drawn.
|
||||
if (!mShouldDrawNotificationBackground) {
|
||||
return;
|
||||
}
|
||||
final boolean newFlowHideShelf = Settings.Global.getInt(mContext.getContentResolver(),
|
||||
Settings.Global.SHOW_NEW_NOTIF_DISMISS, 1 /* on by default */) == 1;
|
||||
if (newFlowHideShelf) {
|
||||
mBackgroundPaint.setColor(Color.TRANSPARENT);
|
||||
invalidate();
|
||||
return;
|
||||
}
|
||||
// Interpolate between semi-transparent notification panel background color
|
||||
// and white AOD separator.
|
||||
float colorInterpolation = MathUtils.smoothStep(0.4f /* start */, 1f /* end */,
|
||||
mLinearHideAmount);
|
||||
int color = ColorUtils.blendARGB(mBgColor, Color.WHITE, colorInterpolation);
|
||||
|
||||
if (mCachedBackgroundColor != color) {
|
||||
mCachedBackgroundColor = color;
|
||||
mBackgroundPaint.setColor(color);
|
||||
invalidate();
|
||||
}
|
||||
}
|
||||
|
||||
private void reinitView() {
|
||||
initView(getContext(), mKeyguardBypassEnabledProvider, mSwipeHelper);
|
||||
}
|
||||
@@ -979,7 +783,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
updateContentHeight();
|
||||
clampScrollPosition();
|
||||
requestChildrenUpdate();
|
||||
updateFirstAndLastBackgroundViews();
|
||||
updateFirstAndLastExpandableView();
|
||||
updateAlgorithmLayoutMinHeight();
|
||||
updateOwnTranslationZ();
|
||||
}
|
||||
@@ -1050,9 +854,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
private void onPreDrawDuringAnimation() {
|
||||
mShelf.updateAppearance();
|
||||
updateClippingToTopRoundedCorner();
|
||||
if (!mNeedsAnimation && !mChildrenUpdateRequested) {
|
||||
updateBackground();
|
||||
}
|
||||
}
|
||||
|
||||
@ShadeViewRefactor(RefactorComponent.SHADE_VIEW)
|
||||
@@ -2369,131 +2170,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
}
|
||||
}
|
||||
|
||||
@ShadeViewRefactor(RefactorComponent.SHADE_VIEW)
|
||||
private void updateBackground() {
|
||||
// No need to update the background color if it's not being drawn.
|
||||
if (!mShouldDrawNotificationBackground) {
|
||||
return;
|
||||
}
|
||||
|
||||
updateBackgroundBounds();
|
||||
if (didSectionBoundsChange()) {
|
||||
boolean animate = mAnimateNextSectionBoundsChange || mAnimateNextBackgroundTop
|
||||
|| mAnimateNextBackgroundBottom || areSectionBoundsAnimating();
|
||||
if (!isExpanded()) {
|
||||
abortBackgroundAnimators();
|
||||
animate = false;
|
||||
}
|
||||
if (animate) {
|
||||
startBackgroundAnimation();
|
||||
} else {
|
||||
for (NotificationSection section : mSections) {
|
||||
section.resetCurrentBounds();
|
||||
}
|
||||
invalidate();
|
||||
}
|
||||
} else {
|
||||
abortBackgroundAnimators();
|
||||
}
|
||||
mAnimateNextBackgroundTop = false;
|
||||
mAnimateNextBackgroundBottom = false;
|
||||
mAnimateNextSectionBoundsChange = false;
|
||||
}
|
||||
|
||||
@ShadeViewRefactor(RefactorComponent.STATE_RESOLVER)
|
||||
private void abortBackgroundAnimators() {
|
||||
for (NotificationSection section : mSections) {
|
||||
section.cancelAnimators();
|
||||
}
|
||||
}
|
||||
|
||||
private boolean didSectionBoundsChange() {
|
||||
for (NotificationSection section : mSections) {
|
||||
if (section.didBoundsChange()) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@ShadeViewRefactor(RefactorComponent.STATE_RESOLVER)
|
||||
private boolean areSectionBoundsAnimating() {
|
||||
for (NotificationSection section : mSections) {
|
||||
if (section.areBoundsAnimating()) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@ShadeViewRefactor(RefactorComponent.STATE_RESOLVER)
|
||||
private void startBackgroundAnimation() {
|
||||
// TODO(kprevas): do we still need separate fields for top/bottom?
|
||||
// or can each section manage its own animation state?
|
||||
NotificationSection firstVisibleSection = getFirstVisibleSection();
|
||||
NotificationSection lastVisibleSection = getLastVisibleSection();
|
||||
for (NotificationSection section : mSections) {
|
||||
section.startBackgroundAnimation(
|
||||
section == firstVisibleSection
|
||||
? mAnimateNextBackgroundTop
|
||||
: mAnimateNextSectionBoundsChange,
|
||||
section == lastVisibleSection
|
||||
? mAnimateNextBackgroundBottom
|
||||
: mAnimateNextSectionBoundsChange);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the background bounds to the new desired bounds
|
||||
*/
|
||||
@ShadeViewRefactor(RefactorComponent.SHADE_VIEW)
|
||||
private void updateBackgroundBounds() {
|
||||
int left = mSidePaddings;
|
||||
int right = getWidth() - mSidePaddings;
|
||||
for (NotificationSection section : mSections) {
|
||||
section.getBounds().left = left;
|
||||
section.getBounds().right = right;
|
||||
}
|
||||
|
||||
if (!mIsExpanded) {
|
||||
for (NotificationSection section : mSections) {
|
||||
section.getBounds().top = 0;
|
||||
section.getBounds().bottom = 0;
|
||||
}
|
||||
return;
|
||||
}
|
||||
int minTopPosition;
|
||||
NotificationSection lastSection = getLastVisibleSection();
|
||||
boolean onKeyguard = mStatusBarState == StatusBarState.KEYGUARD;
|
||||
if (!onKeyguard) {
|
||||
minTopPosition = (int) (mTopPadding + mStackTranslation);
|
||||
} else if (lastSection == null) {
|
||||
minTopPosition = mTopPadding;
|
||||
} else {
|
||||
// The first sections could be empty while there could still be elements in later
|
||||
// sections. The position of these first few sections is determined by the position of
|
||||
// the first visible section.
|
||||
NotificationSection firstVisibleSection = getFirstVisibleSection();
|
||||
firstVisibleSection.updateBounds(0 /* minTopPosition*/, 0 /* minBottomPosition */,
|
||||
false /* shiftPulsingWithFirst */);
|
||||
minTopPosition = firstVisibleSection.getBounds().top;
|
||||
}
|
||||
boolean shiftPulsingWithFirst = mNumHeadsUp <= 1
|
||||
&& (mAmbientState.isDozing()
|
||||
|| (mKeyguardBypassEnabledProvider.getBypassEnabled() && onKeyguard));
|
||||
for (NotificationSection section : mSections) {
|
||||
int minBottomPosition = minTopPosition;
|
||||
if (section == lastSection) {
|
||||
// We need to make sure the section goes all the way to the shelf
|
||||
minBottomPosition = (int) (ViewState.getFinalTranslationY(mShelf)
|
||||
+ mShelf.getIntrinsicHeight());
|
||||
}
|
||||
minTopPosition = section.updateBounds(minTopPosition, minBottomPosition,
|
||||
shiftPulsingWithFirst);
|
||||
shiftPulsingWithFirst = false;
|
||||
}
|
||||
}
|
||||
|
||||
private NotificationSection getFirstVisibleSection() {
|
||||
for (NotificationSection section : mSections) {
|
||||
if (section.getFirstVisibleChild() != null) {
|
||||
@@ -2514,7 +2190,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
}
|
||||
|
||||
@ShadeViewRefactor(RefactorComponent.COORDINATOR)
|
||||
private ExpandableView getLastChildWithBackground() {
|
||||
private ExpandableView getLastExpandableView() {
|
||||
int childCount = getChildCount();
|
||||
for (int i = childCount - 1; i >= 0; i--) {
|
||||
ExpandableView child = (ExpandableView) getChildAt(i);
|
||||
@@ -2527,7 +2203,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
}
|
||||
|
||||
@ShadeViewRefactor(RefactorComponent.COORDINATOR)
|
||||
private ExpandableView getFirstChildWithBackground() {
|
||||
private ExpandableView getFirstExpandableView() {
|
||||
int childCount = getChildCount();
|
||||
for (int i = 0; i < childCount; i++) {
|
||||
ExpandableView child = (ExpandableView) getChildAt(i);
|
||||
@@ -2540,7 +2216,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
}
|
||||
|
||||
//TODO: We shouldn't have to generate this list every time
|
||||
private List<ExpandableView> getChildrenWithBackground() {
|
||||
private List<ExpandableView> getExpandableViewList() {
|
||||
ArrayList<ExpandableView> children = new ArrayList<>();
|
||||
int childCount = getChildCount();
|
||||
for (int i = 0; i < childCount; i++) {
|
||||
@@ -3078,32 +2754,13 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
}
|
||||
|
||||
@ShadeViewRefactor(RefactorComponent.STATE_RESOLVER)
|
||||
private void updateFirstAndLastBackgroundViews() {
|
||||
NotificationSection firstSection = getFirstVisibleSection();
|
||||
NotificationSection lastSection = getLastVisibleSection();
|
||||
ExpandableView previousFirstChild =
|
||||
firstSection == null ? null : firstSection.getFirstVisibleChild();
|
||||
ExpandableView previousLastChild =
|
||||
lastSection == null ? null : lastSection.getLastVisibleChild();
|
||||
|
||||
ExpandableView firstChild = getFirstChildWithBackground();
|
||||
ExpandableView lastChild = getLastChildWithBackground();
|
||||
boolean sectionViewsChanged = mSectionsManager.updateFirstAndLastViewsForAllSections(
|
||||
mSections, getChildrenWithBackground());
|
||||
|
||||
if (mAnimationsEnabled && mIsExpanded) {
|
||||
mAnimateNextBackgroundTop = firstChild != previousFirstChild;
|
||||
mAnimateNextBackgroundBottom = lastChild != previousLastChild || mAnimateBottomOnLayout;
|
||||
mAnimateNextSectionBoundsChange = sectionViewsChanged;
|
||||
} else {
|
||||
mAnimateNextBackgroundTop = false;
|
||||
mAnimateNextBackgroundBottom = false;
|
||||
mAnimateNextSectionBoundsChange = false;
|
||||
}
|
||||
private void updateFirstAndLastExpandableView() {
|
||||
ExpandableView lastChild = getLastExpandableView();
|
||||
mSectionsManager.updateFirstAndLastViewsForAllSections(
|
||||
mSections, getExpandableViewList());
|
||||
mAmbientState.setLastVisibleBackgroundChild(lastChild);
|
||||
// TODO: Refactor SectionManager and put the RoundnessManager there.
|
||||
mController.getNoticationRoundessManager().updateRoundedChildren(mSections);
|
||||
mAnimateBottomOnLayout = false;
|
||||
invalidate();
|
||||
}
|
||||
|
||||
@@ -3265,7 +2922,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
setAnimationRunning(true);
|
||||
mStateAnimator.startAnimationForEvents(mAnimationEvents, mGoToFullShadeDelay);
|
||||
mAnimationEvents.clear();
|
||||
updateBackground();
|
||||
updateViewShadows();
|
||||
updateClippingToTopRoundedCorner();
|
||||
} else {
|
||||
@@ -4350,7 +4006,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
@ShadeViewRefactor(RefactorComponent.SHADE_VIEW)
|
||||
private void setDimAmount(float dimAmount) {
|
||||
mDimAmount = dimAmount;
|
||||
updateBackgroundDimming();
|
||||
}
|
||||
|
||||
@ShadeViewRefactor(RefactorComponent.STATE_RESOLVER)
|
||||
@@ -4419,7 +4074,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
}
|
||||
runAnimationFinishedRunnables();
|
||||
setAnimationRunning(false);
|
||||
updateBackground();
|
||||
updateViewShadows();
|
||||
updateClippingToTopRoundedCorner();
|
||||
}
|
||||
@@ -4554,7 +4208,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
invalidateOutline();
|
||||
}
|
||||
updateAlgorithmHeightAndPadding();
|
||||
updateBackgroundDimming();
|
||||
requestChildrenUpdate();
|
||||
updateOwnTranslationZ();
|
||||
}
|
||||
@@ -5435,7 +5088,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
*/
|
||||
public void setDozeAmount(float dozeAmount) {
|
||||
mAmbientState.setDozeAmount(dozeAmount);
|
||||
updateContinuousBackgroundDrawing();
|
||||
requestChildrenUpdate();
|
||||
}
|
||||
|
||||
@@ -5473,7 +5125,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
}
|
||||
|
||||
void setAnimateBottomOnLayout(boolean animateBottomOnLayout) {
|
||||
mAnimateBottomOnLayout = animateBottomOnLayout;
|
||||
}
|
||||
|
||||
public void setOnPulseHeightChangedListener(Runnable listener) {
|
||||
@@ -5506,25 +5157,14 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
|
||||
void onSwipeBegin() {
|
||||
requestDisallowInterceptTouchEvent(true);
|
||||
updateFirstAndLastBackgroundViews();
|
||||
updateContinuousShadowDrawing();
|
||||
updateContinuousBackgroundDrawing();
|
||||
requestChildrenUpdate();
|
||||
}
|
||||
|
||||
void onSwipeEnd() {
|
||||
updateFirstAndLastBackgroundViews();
|
||||
}
|
||||
|
||||
void setTopHeadsUpEntry(NotificationEntry topEntry) {
|
||||
mTopHeadsUpEntry = topEntry;
|
||||
}
|
||||
|
||||
void setNumHeadsUp(long numHeadsUp) {
|
||||
mNumHeadsUp = numHeadsUp;
|
||||
mAmbientState.setHasAlertEntries(numHeadsUp > 0);
|
||||
}
|
||||
|
||||
public boolean getIsExpanded() {
|
||||
return mIsExpanded;
|
||||
}
|
||||
@@ -5639,27 +5279,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
|
||||
mSectionsManager.updateSectionBoundaries(reason);
|
||||
}
|
||||
|
||||
boolean isSilkDismissEnabled() {
|
||||
return Settings.Global.getInt(mContext.getContentResolver(),
|
||||
Settings.Global.SHOW_NEW_NOTIF_DISMISS, 1 /* enabled by default */) == 1;
|
||||
}
|
||||
|
||||
void updateContinuousBackgroundDrawing() {
|
||||
if (isSilkDismissEnabled()) {
|
||||
return;
|
||||
}
|
||||
boolean continuousBackground = !mAmbientState.isFullyAwake()
|
||||
&& mSwipeHelper.isSwiping();
|
||||
if (continuousBackground != mContinuousBackgroundUpdate) {
|
||||
mContinuousBackgroundUpdate = continuousBackground;
|
||||
if (continuousBackground) {
|
||||
getViewTreeObserver().addOnPreDrawListener(mBackgroundUpdater);
|
||||
} else {
|
||||
getViewTreeObserver().removeOnPreDrawListener(mBackgroundUpdater);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ShadeViewRefactor(RefactorComponent.STATE_RESOLVER)
|
||||
void updateContinuousShadowDrawing() {
|
||||
boolean continuousShadowUpdate = mAnimationRunning
|
||||
|
||||
@@ -394,7 +394,6 @@ public class NotificationStackScrollLayoutController {
|
||||
if (mView.getDismissAllInProgress()) {
|
||||
return;
|
||||
}
|
||||
mView.onSwipeEnd();
|
||||
if (view instanceof ExpandableNotificationRow) {
|
||||
ExpandableNotificationRow row = (ExpandableNotificationRow) view;
|
||||
if (row.isHeadsUp()) {
|
||||
@@ -454,7 +453,6 @@ public class NotificationStackScrollLayoutController {
|
||||
|
||||
@Override
|
||||
public void onChildSnappedBack(View animView, float targetLeft) {
|
||||
mView.onSwipeEnd();
|
||||
if (animView instanceof ExpandableNotificationRow) {
|
||||
ExpandableNotificationRow row = (ExpandableNotificationRow) animView;
|
||||
if (row.isPinned() && !canChildBeDismissed(row)
|
||||
@@ -518,9 +516,7 @@ public class NotificationStackScrollLayoutController {
|
||||
|
||||
@Override
|
||||
public void onHeadsUpStateChanged(NotificationEntry entry, boolean isHeadsUp) {
|
||||
long numEntries = mHeadsUpManager.getAllEntries().count();
|
||||
NotificationEntry topEntry = mHeadsUpManager.getTopEntry();
|
||||
mView.setNumHeadsUp(numEntries);
|
||||
mView.setTopHeadsUpEntry(topEntry);
|
||||
mNotificationRoundnessManager.updateView(entry.getRow(), false /* animate */);
|
||||
}
|
||||
@@ -665,8 +661,6 @@ public class NotificationStackScrollLayoutController {
|
||||
mHeadsUpManager.setAnimationStateHandler(mView::setHeadsUpGoingAwayAnimationsAllowed);
|
||||
mDynamicPrivacyController.addListener(mDynamicPrivacyControllerListener);
|
||||
|
||||
mScrimController.setScrimBehindChangeRunnable(mView::updateBackgroundDimming);
|
||||
|
||||
mLockscreenUserManager.addUserChangedListener(mLockscreenUserChangeListener);
|
||||
|
||||
mFadeNotificationsOnDismiss = // TODO: this should probably be injected directly
|
||||
|
||||
Reference in New Issue
Block a user