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

Commit 587cbf30 authored by Selim Cinek's avatar Selim Cinek
Browse files

Remove the scale animation from the lockscreen 

With fullbleed notifications don't scale anymore when clicked.

Change-Id: I75fadb5e6ccb7f12ca8fc1cb9459c6d9576f4abd
parent 33d4614d

packages/SystemUI/res/values/dimens.xml

+0 −3
Original line number Diff line number Diff line
@@ -301,9 +301,6 @@ 
    <!-- Z distance between notifications if they are in the stack -->

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



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

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



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

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

packages/SystemUI/res/values/ids.xml

+0 −3
Original line number Diff line number Diff line
@@ -18,19 +18,16 @@ 
<resources>

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

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

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

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

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

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

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

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

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

    <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="translation_y_animator_start_value_tag"/>

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

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

    <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"/>

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

+3 −3
Original line number Diff line number Diff line
@@ -430,8 +430,8 @@ public class NotificationPanelView extends PanelView implements 
    public int computeMaxKeyguardNotifications(int maximum) {

        float minPadding = mClockPositionAlgorithm.getMinStackScrollerPadding(getHeight(),

                mKeyguardStatusView.getHeight());

        int keyguardPadding = getResources().getDimensionPixelSize(

                R.dimen.notification_padding_dimmed);

        int notificationPadding = getResources().getDimensionPixelSize(

                R.dimen.notification_padding);

        final int overflowheight = getResources().getDimensionPixelSize(

                R.dimen.notification_summary_height);

        float bottomStackSize = mNotificationStackScroller.getKeyguardBottomStackSize();
@@ -443,7 +443,7 @@ public class NotificationPanelView extends PanelView implements 
            if (!(child instanceof ExpandableNotificationRow)) {

                continue;

            }

            availableSpace -= child.getMinHeight() + keyguardPadding;

            availableSpace -= child.getMinHeight() + notificationPadding;

            if (availableSpace >= 0 && count < maximum) {

                count++;

            } else {

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

+0 −8
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ public class AnimationFilter { 
    boolean animateAlpha;

    boolean animateY;

    boolean animateZ;

    boolean animateScale;

    boolean animateHeight;

    boolean animateTopInset;

    boolean animateDimmed;
@@ -57,11 +56,6 @@ public class AnimationFilter { 
        return this;

    }



    public AnimationFilter animateScale() {

        animateScale = true;

        return this;

    }



    public AnimationFilter animateHeight() {

        animateHeight = true;

        return this;
@@ -118,7 +112,6 @@ public class AnimationFilter { 
        animateAlpha |= filter.animateAlpha;

        animateY |= filter.animateY;

        animateZ |= filter.animateZ;

        animateScale |= filter.animateScale;

        animateHeight |= filter.animateHeight;

        animateTopInset |= filter.animateTopInset;

        animateDimmed |= filter.animateDimmed;
@@ -131,7 +124,6 @@ public class AnimationFilter { 
        animateAlpha = false;

        animateY = false;

        animateZ = false;

        animateScale = false;

        animateHeight = false;

        animateTopInset = false;

        animateDimmed = false;

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

+0 −1
Original line number Diff line number Diff line
@@ -324,7 +324,6 @@ public class NotificationChildrenContainer extends ViewGroup { 
            childState.dark = parentState.dark;

            childState.hideSensitive = parentState.hideSensitive;

            childState.belowSpeedBump = parentState.belowSpeedBump;

            childState.scale =  1.0f;

            childState.clipTopAmount = 0;

            childState.topOverLap = 0;

            boolean visible = i <= lastVisibleIndex;