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

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

Merge changes I884b6830,Iee71e4eb into lmp-preview-dev 

* changes:
  The layertype was incorrectly restored with overlapping alpha animations.
  Decreased shadows between notifications slightly.
parents 048aad39 1efb240c

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ 
    <dimen name="notification_side_padding">8dp</dimen>



    <!-- Z distance between notifications if they are in the stack -->

    <dimen name="z_distance_between_notifications">2dp</dimen>

    <dimen name="z_distance_between_notifications">1dp</dimen>



    <!-- The padding between the individual notification cards when dimmed. -->

    <dimen name="notification_padding_dimmed">0dp</dimen>

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

+1 −2
Original line number Diff line number Diff line
@@ -315,14 +315,13 @@ public class StackStateAnimator { 
                child.getAlpha(), newEndValue);

        animator.setInterpolator(mFastOutSlowInInterpolator);

        // Handle layer type

        final int currentLayerType = child.getLayerType();

        child.setLayerType(View.LAYER_TYPE_HARDWARE, null);

        animator.addListener(new AnimatorListenerAdapter() {

            public boolean mWasCancelled;



            @Override

            public void onAnimationEnd(Animator animation) {

                child.setLayerType(currentLayerType, null);

                child.setLayerType(View.LAYER_TYPE_NONE, null);

                if (newEndValue == 0 && !mWasCancelled) {

                    child.setVisibility(View.INVISIBLE);

                }