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

Commit 927892e9 authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge changes from topic "shadowalpha" 

* changes:
  Fixed an issue where notifications could be stuck empty
  Removed the shadow alpha property from notifications
parents 657c8ff1 d4c3230d

packages/SystemUI/res/values/ids.xml

+0 −3
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
    <item type="id" name="height_animator_tag"/>

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

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

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

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

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

    <item type="id" name="translation_z_animator_end_value_tag"/>
@@ -35,7 +34,6 @@ 
    <item type="id" name="alpha_animator_end_value_tag"/>

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

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

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

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

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

    <item type="id" name="translation_x_animator_start_value_tag"/>
@@ -46,7 +44,6 @@ 
    <item type="id" name="alpha_animator_start_value_tag"/>

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

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

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

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

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

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

packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java

+0 −1
Original line number Diff line number Diff line
@@ -481,7 +481,6 @@ public class BubbleStackView extends FrameLayout implements BubbleTouchHandler.F 
        viewState.dimmed = false;

        viewState.dark = false;

        viewState.alpha = 1f;

        viewState.shadowAlpha = 1f;

        viewState.notGoneIndex = -1;

        viewState.xTranslation = 0;

        viewState.yTranslation = 0;

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

+0 −1
Original line number Diff line number Diff line
@@ -220,7 +220,6 @@ public class NotificationShelf extends ActivatableNotificationView implements 
            mShelfState.clipTopAmount = 0;

            mShelfState.alpha = mAmbientState.hasPulsingNotifications() ? 0 : 1;

            mShelfState.belowSpeedBump = mAmbientState.getSpeedBumpIndex() == 0;

            mShelfState.shadowAlpha = 1.0f;

            mShelfState.hideSensitive = false;

            mShelfState.xTranslation = getTranslationX();

            if (mNotGoneIndex != -1) {

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

+0 −15
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView 
            updateOutlineAlpha();

        }

    };

    private float mShadowAlpha = 1.0f;

    private FakeShadowView mFakeShadow;

    private int mCurrentBackgroundTint;

    private int mTargetTint;
@@ -479,7 +478,6 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView 
        }

        float alpha = NotificationStackScrollLayout.BACKGROUND_ALPHA_DIMMED;

        alpha = (alpha + (1.0f - alpha) * mNormalBackgroundVisibilityAmount);

        alpha *= mShadowAlpha;

        if (mFadeInFromDarkAnimator != null) {

            alpha *= mFadeInFromDarkAnimator.getAnimatedFraction();

        }
@@ -1093,19 +1091,6 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView 
        return calculateBgColor() == otherView.calculateBgColor();

    }



    @Override

    public float getShadowAlpha() {

        return mShadowAlpha;

    }



    @Override

    public void setShadowAlpha(float shadowAlpha) {

        if (shadowAlpha != mShadowAlpha) {

            mShadowAlpha = shadowAlpha;

            updateOutlineAlpha();

        }

    }



    @Override

    public void setFakeShadowIntensity(float shadowIntensity, float outlineAlpha, int shadowYEnd,

            int outlineTranslation) {

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

+0 −7
Original line number Diff line number Diff line
@@ -443,13 +443,6 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable { 
        return super.hasOverlappingRendering() && getActualHeight() <= getHeight();

    }



    public float getShadowAlpha() {

        return 0.0f;

    }



    public void setShadowAlpha(float shadowAlpha) {

    }



    /**

     * @return an amount between -1 and 1 of increased padding that this child needs. 1 means it

     * needs a full increased padding while -1 means it needs no padding at all. For 0.0f the normal