Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c56aa07 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Android (Google) Code Review
Browse files

Merge "Don't collapse the Shade when expanding a notification." into sc-dev

parents 6bf27625 6a7e3d36

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

+11 −7
Original line number Diff line number Diff line
@@ -2024,17 +2024,22 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        int top = params.getTop();

        float interpolation = Interpolators.FAST_OUT_SLOW_IN.getInterpolation(params.getProgress());

        int startClipTopAmount = params.getStartClipTopAmount();

        int clipTopAmount = (int) MathUtils.lerp(startClipTopAmount, 0, interpolation);

        if (mNotificationParent != null) {

            float parentY = mNotificationParent.getTranslationY();

            top -= parentY;

            mNotificationParent.setTranslationZ(translationZ);



            // When the expanding notification is below its parent, the parent must be clipped

            // exactly how it was clipped before the animation. When the expanding notification is

            // on or above its parent (top <= 0), then the parent must be clipped exactly 'top'

            // pixels to show the expanding notification, while still taking the decreasing

            // notification clipTopAmount into consideration, so 'top + clipTopAmount'.

            int parentStartClipTopAmount = params.getParentStartClipTopAmount();

            if (startClipTopAmount != 0) {

                int clipTopAmount = (int) MathUtils.lerp(parentStartClipTopAmount,

                        parentStartClipTopAmount - startClipTopAmount,

                        interpolation);

                mNotificationParent.setClipTopAmount(clipTopAmount);

            }

            int parentClipTopAmount = Math.min(parentStartClipTopAmount,

                    top + clipTopAmount);

            mNotificationParent.setClipTopAmount(parentClipTopAmount);



            mNotificationParent.setExtraWidthForClipping(extraWidthForClipping);

            float clipBottom = Math.max(params.getBottom(),

                    parentY + mNotificationParent.getActualHeight()
@@ -2043,7 +2048,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
            int minimumHeightForClipping = (int) (clipBottom - clipTop);

            mNotificationParent.setMinimumHeightForClipping(minimumHeightForClipping);

        } else if (startClipTopAmount != 0) {

            int clipTopAmount = (int) MathUtils.lerp(startClipTopAmount, 0, interpolation);

            setClipTopAmount(clipTopAmount);

        }

        setTranslationY(top);

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java

+0 −5
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.widget.RemoteViews; 
import android.widget.TextView;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.widget.CachingIconView;

import com.android.internal.widget.NotificationExpandButton;

import com.android.systemui.R;

import com.android.systemui.statusbar.CrossFadeHelper;
@@ -638,10 +637,6 @@ public class NotificationChildrenContainer extends ViewGroup { 
            childState.location = parentState.location;

            childState.inShelf = parentState.inShelf;

            yPosition += intrinsicHeight;

            if (child.isExpandAnimationRunning()) {

                launchTransitionCompensation = -ambientState.getExpandAnimationTopChange();

            }



        }

        if (mOverflowNumber != null) {

            ExpandableNotificationRow overflowView = mAttachedChildren.get(Math.min(

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java

+1 −6
Original line number Diff line number Diff line
@@ -28,14 +28,12 @@ import android.view.ViewGroup; 
import com.android.systemui.R;

import com.android.systemui.statusbar.EmptyShadeView;

import com.android.systemui.statusbar.NotificationShelf;

import com.android.systemui.statusbar.notification.NotificationUtils;

import com.android.systemui.statusbar.notification.row.ActivatableNotificationView;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;

import com.android.systemui.statusbar.notification.row.ExpandableView;

import com.android.systemui.statusbar.notification.row.FooterView;



import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;



/**
@@ -156,7 +154,7 @@ public class StackScrollAlgorithm { 
    private void updateClipping(StackScrollAlgorithmState algorithmState,

            AmbientState ambientState) {

        float drawStart = !ambientState.isOnKeyguard() ? ambientState.getTopPadding()

                + ambientState.getStackTranslation() + ambientState.getExpandAnimationTopChange()

                + ambientState.getStackTranslation()

                : 0;

        float clipStart = 0;

        int childCount = algorithmState.visibleChildren.size();
@@ -329,9 +327,6 @@ public class StackScrollAlgorithm { 
        childViewState.location = ExpandableViewState.LOCATION_MAIN_AREA;

        float inset = ambientState.getTopPadding() + ambientState.getStackTranslation()

                + ambientState.getSectionPadding();

        if (i <= algorithmState.getIndexOfExpandingNotification()) {

            inset += ambientState.getExpandAnimationTopChange();

        }

        if (child.mustStayOnScreen() && childViewState.yTranslation >= 0) {

            // Even if we're not scrolled away we're in view and we're also not in the

            // shelf. We can relax the constraints and let us scroll off the top!

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+11 −13
Original line number Diff line number Diff line
@@ -439,7 +439,6 @@ public class NotificationPanelViewController extends PanelViewController { 
    private LockscreenGestureLogger mLockscreenGestureLogger = new LockscreenGestureLogger();

    private boolean mUserSetupComplete;

    private int mQsNotificationTopPadding;

    private float mExpandOffset;

    private boolean mHideIconsDuringNotificationLaunch = true;

    private int mStackScrollerMeasuringPass;

    private ArrayList<Consumer<ExpandableNotificationRow>>
@@ -2444,8 +2443,7 @@ public class NotificationPanelViewController extends PanelViewController { 
            }

            startHeight = -mQs.getQsMinExpansionHeight();

        }

        float translation = MathUtils.lerp(startHeight, 0, Math.min(1.0f, appearAmount))

                + mExpandOffset;

        float translation = MathUtils.lerp(startHeight, 0, Math.min(1.0f, appearAmount));

        return Math.min(0, translation);

    }
@@ -3185,9 +3183,10 @@ public class NotificationPanelViewController extends PanelViewController { 
    }



    public void applyExpandAnimationParams(ExpandAnimationParameters params) {

        mExpandOffset = params != null ? params.getTopChange() : 0;

        updateQsExpansion();

        if (params != null) {

        if (params == null) {

            return;

        }



        boolean hideIcons = params.getProgress(

                ActivityLaunchAnimator.ANIMATION_DELAY_ICON_FADE_IN, 100) == 0.0f;

        if (hideIcons != mHideIconsDuringNotificationLaunch) {
@@ -3197,7 +3196,6 @@ public class NotificationPanelViewController extends PanelViewController { 
            }

        }

    }

    }



    public void addTrackingHeadsUpListener(Consumer<ExpandableNotificationRow> listener) {

        mTrackingHeadsUpListeners.add(listener);

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java

+3 −11
Original line number Diff line number Diff line
@@ -89,30 +89,22 @@ public class NotificationsQuickSettingsContainer extends ConstraintLayout 


    @Override

    protected void dispatchDraw(Canvas canvas) {

        // Invert the order of the scroll view and user switcher such that the notifications receive

        // touches first but the panel gets drawn above.

        mDrawingOrderedChildren.clear();

        mLayoutDrawingOrder.clear();

        if (mKeyguardStatusBar.getVisibility() == View.VISIBLE) {

            mDrawingOrderedChildren.add(mKeyguardStatusBar);

            mLayoutDrawingOrder.add(mKeyguardStatusBar);

        }

        if (mStackScroller.getVisibility() == View.VISIBLE) {

            mDrawingOrderedChildren.add(mStackScroller);

            mLayoutDrawingOrder.add(mStackScroller);

        }

        if (mQsFrame.getVisibility() == View.VISIBLE) {

            mDrawingOrderedChildren.add(mQsFrame);

            mLayoutDrawingOrder.add(mQsFrame);

        }



        if (mHasViewsAboveShelf) {

            // StackScroller needs to be on top

            mDrawingOrderedChildren.remove(mStackScroller);

        if (mStackScroller.getVisibility() == View.VISIBLE) {

            mDrawingOrderedChildren.add(mStackScroller);

            mLayoutDrawingOrder.add(mStackScroller);

        }



        // Let's now find the order that the view has when drawing regulary by sorting

        // Let's now find the order that the view has when drawing regularly by sorting

        mLayoutDrawingOrder.sort(mIndexComparator);

        super.dispatchDraw(canvas);

    }