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

Commit 5104a6db authored by Selim Cinek's avatar Selim Cinek
Browse files

Fixed the animations on the notification scrims 

When pulling down on a heads up notification the scrim would
fade in from 0 instead of fading to the new position.
The old behavior didn't work if the heads up notifications were
big, so we had to change it in order to always have a scrim.

Change-Id: I9ae387b75136c9240d863e06a8649c85b3c6c9dc
parent 31aada4e

packages/SystemUI/res/values/ids.xml

+2 −2
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ 
    <item type="id" name="qs_icon_tag"/>

    <item type="id" name="scrim"/>

    <item type="id" name="scrim_target"/>

    <item type="id" name="hun_scrim_alpha_start"/>

    <item type="id" name="hun_scrim_alpha_end"/>

    <item type="id" name="scrim_alpha_start"/>

    <item type="id" name="scrim_alpha_end"/>

    <item type="id" name="notification_power"/>

    <item type="id" name="notification_screenshot"/>

    <item type="id" name="notification_hidden"/>

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

+4 −1
Original line number Diff line number Diff line
@@ -164,6 +164,9 @@ public class PhoneStatusBarView extends PanelBar { 
    public void panelScrimMinFractionChanged(float minFraction) {

        if (mMinFraction != minFraction) {

            mMinFraction = minFraction;

            if (minFraction != 0.0f) {

                mScrimController.animateNextChange();

            }

            updateScrimFraction();

        }

    }
@@ -176,7 +179,7 @@ public class PhoneStatusBarView extends PanelBar { 
    }



    private void updateScrimFraction() {

        float scrimFraction = Math.max(mPanelFraction - mMinFraction / (1.0f - mMinFraction), 0);

        float scrimFraction = Math.max(mPanelFraction, mMinFraction);

        mScrimController.setPanelExpansion(scrimFraction);

    }

}

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

+26 −33
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
    private static final float SCRIM_IN_FRONT_ALPHA = 0.75f;

    private static final int TAG_KEY_ANIM = R.id.scrim;

    private static final int TAG_KEY_ANIM_TARGET = R.id.scrim_target;

    private static final int TAG_HUN_START_ALPHA = R.id.hun_scrim_alpha_start;

    private static final int TAG_HUN_END_ALPHA = R.id.hun_scrim_alpha_end;

    private static final int TAG_START_ALPHA = R.id.scrim_alpha_start;

    private static final int TAG_END_ALPHA = R.id.scrim_alpha_end;



    private final ScrimView mScrimBehind;

    private final ScrimView mScrimInFront;
@@ -164,6 +164,10 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
        scheduleUpdate();

    }



    public void animateNextChange() {

        mAnimateChange = true;

    }



    public void setDozing(boolean dozing) {

        if (mDozing != dozing) {

            mDozing = dozing;
@@ -271,21 +275,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
    }



    private void setScrimColor(View scrim, float alpha) {

        ValueAnimator runningAnim = (ValueAnimator) scrim.getTag(TAG_KEY_ANIM);

        Float target = (Float) scrim.getTag(TAG_KEY_ANIM_TARGET);

        if (runningAnim != null && target != null) {

            if (alpha != target) {

                runningAnim.cancel();

            } else {

                return;

            }

        }

        if (mAnimateChange) {

            startScrimAnimation(scrim, alpha);

        } else {

            setCurrentScrimAlpha(scrim, alpha);

            updateScrimColor(scrim);

        }

        updateScrim(mAnimateChange, scrim, alpha, getCurrentScrimAlpha(scrim));

    }



    private float getDozeAlpha(View scrim) {
@@ -428,41 +418,44 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
    }



    private void updateHeadsUpScrim(boolean animate) {

        float alpha = calculateHeadsUpAlpha();

        ValueAnimator previousAnimator = StackStateAnimator.getChildTag(mHeadsUpScrim,

        updateScrim(animate, mHeadsUpScrim, calculateHeadsUpAlpha(), mCurrentHeadsUpAlpha);

    }



    private void updateScrim(boolean animate, View scrim, float alpha, float currentAlpha) {

        ValueAnimator previousAnimator = StackStateAnimator.getChildTag(scrim,

                TAG_KEY_ANIM);

        float animEndValue = -1;

        if (previousAnimator != null) {

            if (animate || alpha == mCurrentHeadsUpAlpha) {

            if (animate || alpha == currentAlpha) {

                previousAnimator.cancel();

            } else {

                animEndValue = StackStateAnimator.getChildTag(mHeadsUpScrim, TAG_HUN_END_ALPHA);

                animEndValue = StackStateAnimator.getChildTag(scrim, TAG_END_ALPHA);

            }

        }

        if (alpha != mCurrentHeadsUpAlpha && alpha != animEndValue) {

        if (alpha != currentAlpha && alpha != animEndValue) {

            if (animate) {

                startScrimAnimation(mHeadsUpScrim, alpha);

                mHeadsUpScrim.setTag(TAG_HUN_START_ALPHA, mCurrentHeadsUpAlpha);

                mHeadsUpScrim.setTag(TAG_HUN_END_ALPHA, alpha);

                startScrimAnimation(scrim, alpha);

                scrim.setTag(TAG_START_ALPHA, currentAlpha);

                scrim.setTag(TAG_END_ALPHA, alpha);

            } else {

                if (previousAnimator != null) {

                    float previousStartValue = StackStateAnimator.getChildTag(mHeadsUpScrim,

                            TAG_HUN_START_ALPHA);

                    float previousEndValue = StackStateAnimator.getChildTag(mHeadsUpScrim,

                           TAG_HUN_END_ALPHA);

                    float previousStartValue = StackStateAnimator.getChildTag(scrim,

                            TAG_START_ALPHA);

                    float previousEndValue = StackStateAnimator.getChildTag(scrim,

                            TAG_END_ALPHA);

                    // we need to increase all animation keyframes of the previous animator by the

                    // relative change to the end value

                    PropertyValuesHolder[] values = previousAnimator.getValues();

                    float relativeDiff = alpha - previousEndValue;

                    float newStartValue = previousStartValue + relativeDiff;

                    values[0].setFloatValues(newStartValue, alpha);

                    mHeadsUpScrim.setTag(TAG_HUN_START_ALPHA, newStartValue);

                    mHeadsUpScrim.setTag(TAG_HUN_END_ALPHA, alpha);

                    scrim.setTag(TAG_START_ALPHA, newStartValue);

                    scrim.setTag(TAG_END_ALPHA, alpha);

                    previousAnimator.setCurrentPlayTime(previousAnimator.getCurrentPlayTime());

                } else {

                    // update the alpha directly

                    setCurrentScrimAlpha(mHeadsUpScrim, alpha);

                    updateScrimColor(mHeadsUpScrim);

                    setCurrentScrimAlpha(scrim, alpha);

                    updateScrimColor(scrim);

                }

            }

        }