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

Commit 0f21bc04 authored by d34d's avatar d34d Committed by Clark Scheff
Browse files

SysUI: Invert notification backgrounds 

Notifications for ambient display were enhanced to support fading
back into full color and saturation.  This change involved hiding
the notification background instead of inverting it along with the
rest of the notification view.  This doesn't play well with themes
that use a darker background and lighter text color.

This patch keeps the background visible and inverts it along with
the rest of the notification, which allows the text to be visible.

Change-Id: I8e7cb5b77be096c6a426751ad4c98de2529059d1
parent 4d1dc5a1

packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java

+17 −10
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.view.animation.LinearInterpolator; 
import android.view.animation.PathInterpolator;



import com.android.systemui.R;

import com.android.systemui.ViewInvertHelper;



/**

 * Base class for both {@link ExpandableNotificationRow} and {@link NotificationOverflowContainer}
@@ -138,6 +139,8 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView 
    private final int mNormalColor;

    private final int mLowPriorityColor;

    private boolean mIsBelowSpeedBump;

    private ViewInvertHelper mBackgroundNormalInvertHelper;

    private ViewInvertHelper mBackgroundDimmedInvertHelper;



    public ActivatableNotificationView(Context context, AttributeSet attrs) {

        super(context, attrs);
@@ -174,6 +177,10 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView 
        mBackgroundDimmed = (NotificationBackgroundView) findViewById(R.id.backgroundDimmed);

        mBackgroundNormal.setCustomBackground(R.drawable.notification_material_bg);

        mBackgroundDimmed.setCustomBackground(R.drawable.notification_material_bg_dim);

        mBackgroundNormalInvertHelper =

                new ViewInvertHelper(mBackgroundNormal, DARK_ANIMATION_LENGTH);

        mBackgroundDimmedInvertHelper =

                new ViewInvertHelper(mBackgroundDimmed, DARK_ANIMATION_LENGTH);

        updateBackground();

        updateBackgroundTint();

    }
@@ -406,15 +413,15 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView 
     */

    private void fadeInFromDark(long delay) {

        final View background = mDimmed ? mBackgroundDimmed : mBackgroundNormal;

        background.setAlpha(0f);

        background.setPivotX(mBackgroundDimmed.getWidth() / 2f);

        background.setPivotY(getActualHeight() / 2f);

        background.setScaleX(DARK_EXIT_SCALE_START);

        background.setScaleY(DARK_EXIT_SCALE_START);

        if (mDimmed) {

            mBackgroundDimmedInvertHelper.fade(false, delay);

            mBackgroundNormalInvertHelper.update(false);

        } else {

            mBackgroundDimmedInvertHelper.update(false);

            mBackgroundNormalInvertHelper.fade(false, delay);

        }

        background.animate()

                .alpha(1f)

                .scaleX(1f)

                .scaleY(1f)

                .setDuration(DARK_ANIMATION_LENGTH)

                .setStartDelay(delay)

                .setInterpolator(mLinearOutSlowInInterpolator)
@@ -422,8 +429,6 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView 
                    @Override

                    public void onAnimationCancel(Animator animation) {

                        // Jump state if we are cancelled

                        background.setScaleX(1f);

                        background.setScaleY(1f);

                        background.setAlpha(1f);

                    }

                })
@@ -476,9 +481,11 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView 


    private void updateBackground() {

        cancelFadeAnimations();

        mBackgroundNormalInvertHelper.update(mDark);

        mBackgroundDimmedInvertHelper.update(mDark);

        if (mDark) {

            mBackgroundDimmed.setVisibility(View.INVISIBLE);

            mBackgroundNormal.setVisibility(View.INVISIBLE);

            mBackgroundNormal.setVisibility(View.VISIBLE);

        } else if (mDimmed) {

            mBackgroundDimmed.setVisibility(View.VISIBLE);

            mBackgroundNormal.setVisibility(View.INVISIBLE);