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

Commit 7b5acd7c authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixes a crash with KeyguardStatusView in tests" into qt-r1-dev am: ffb7b7fe 

am: ec2d6a15

Change-Id: Icded9fb89b30f1e2cd586206543b5aa312af4312
parents fc4ee710 ec2d6a15

packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java

+6 −4
Original line number Diff line number Diff line
@@ -414,10 +414,12 @@ public class KeyguardStatusView extends GridLayout implements 
            int expanded = mOwnerInfo.getBottom() + mOwnerInfo.getPaddingBottom();

            int toRemove = (int) ((expanded - collapsed) * ratio);

            setBottom(getMeasuredHeight() - toRemove);

            if (mNotificationIcons != null) {

                // We're using scrolling in order not to overload the translation which is used

                // when appearing the icons

                mNotificationIcons.setScrollY(toRemove);

        } else {

            }

        } else if (mNotificationIcons != null){

            mNotificationIcons.setScrollY(0);

        }

    }