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

Commit ab7b2936 authored by Lyn Han's avatar Lyn Han
Browse files

Revert "Fade in notifications one by one" 

Revert submission 13271843-fade-whole-notifications

Reason for revert: b/178142654
Reverted Changes:
Ic49edf84b:Clip view before shelf and leave the rest unclippe...
Iab095bdbd:Fade in notifications one by one

Change-Id: I6527a32d53a734e7b7310790a478275a75261e18
parent 51ac79c9

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

+0 −6
Original line number Diff line number Diff line
@@ -614,12 +614,6 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable { 
        }

    }



    public void setShouldFadeForShadeOpen(boolean shouldFade) {

        if (!mViewState.gone) {

            mViewState.setShouldFadeForShadeOpen(shouldFade);

        }

    }



    /**

     * @return whether the current view doesn't add height to the overall content. This means that

     * if it is added to a list of items, its content will still have the same height.

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

+0 −10
Original line number Diff line number Diff line
@@ -88,12 +88,6 @@ public class ExpandableViewState extends ViewState { 
    public boolean hideSensitive;

    public boolean belowSpeedBump;

    public boolean inShelf;

    public boolean shouldFadeForShadeOpen;



    @Override

    boolean shouldAnimateAlpha() {

        return shouldFadeForShadeOpen;

    }



    /**

     * A state indicating whether a headsup is currently fully visible, even when not scrolled.
@@ -177,10 +171,6 @@ public class ExpandableViewState extends ViewState { 
        }

    }



    public void setShouldFadeForShadeOpen(boolean shouldFade) {

        shouldFadeForShadeOpen = shouldFade;

    }



    @Override

    public void animateTo(View child, AnimationProperties properties) {

        super.animateTo(child, properties);

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

+0 −1
Original line number Diff line number Diff line
@@ -3947,7 +3947,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        int numChildren = getChildCount();

        for (int i = 0; i < numChildren; i++) {

            ExpandableView child = (ExpandableView) getChildAt(i);

            child.setShouldFadeForShadeOpen(mAmbientState.isShadeOpening());

            child.applyViewState();

        }

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

+5 −8
Original line number Diff line number Diff line
@@ -568,14 +568,11 @@ public class StackScrollAlgorithm { 
            // Add padding before sections for overscroll effect.

            childViewState.yTranslation += ambientState.getSectionPadding();

        }

        boolean show = childViewState.yTranslation < shelfStart

                && !ambientState.isAppearing();

        childViewState.hidden = !show

                && !child.isExpandAnimationRunning()

                && !child.hasExpandingChild();

        childViewState.inShelf = !show;

        childViewState.headsUpIsVisible = show;

        childViewState.alpha = show ? 1f : 0f;

        if (childViewState.yTranslation >= shelfStart) {

            childViewState.hidden = !child.isExpandAnimationRunning() && !child.hasExpandingChild();

            childViewState.inShelf = true;

            childViewState.headsUpIsVisible = false;

        }

    }



    protected int getMaxAllowedChildHeight(View child) {

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

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ public class StackStateAnimator { 
    public static final int ANIMATION_DURATION_CORNER_RADIUS = 200;

    public static final int ANIMATION_DURATION_WAKEUP = 500;

    public static final int ANIMATION_DURATION_GO_TO_FULL_SHADE = 448;

    public static final int ANIMATION_DURATION_FADE_IN = 700;

    public static final int ANIMATION_DURATION_APPEAR_DISAPPEAR = 464;

    public static final int ANIMATION_DURATION_SWIPE = 260;

    public static final int ANIMATION_DURATION_DIMMED_ACTIVATED = 220;