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

Commit 8ee93af8 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed notification shelf not fully visible on lockscreen" into pi-dev am: bb24c6b5 

am: 438a66d7

Change-Id: Iaef4a6566cbccf0e9b29cf57093ad2682ea598a4
parents c62c9fef 438a66d7

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

+2 −4
Original line number Original line Diff line number Diff line
@@ -729,7 +729,7 @@ public class NotificationStackScrollLayout extends ViewGroup 
    }

    }





    private void updateAlgorithmLayoutMinHeight() {

    private void updateAlgorithmLayoutMinHeight() {

        mAmbientState.setLayoutMinHeight(mQsExpanded && !onKeyguard() || isHeadsUpTransition()

        mAmbientState.setLayoutMinHeight(mQsExpanded || isHeadsUpTransition()

                ? getLayoutMinHeight() : 0);

                ? getLayoutMinHeight() : 0);

    }

    }
@@ -2453,7 +2453,6 @@ public class NotificationStackScrollLayout extends ViewGroup 
            }

            }

            int finalHeight = ExpandableViewState.getFinalActualHeight(lastView);

            int finalHeight = ExpandableViewState.getFinalActualHeight(lastView);

            int finalBottom = finalTranslationY + finalHeight - lastView.getClipBottomAmount();

            int finalBottom = finalTranslationY + finalHeight - lastView.getClipBottomAmount();

            finalBottom = Math.min(finalBottom, getHeight());

            if (mAnimateNextBackgroundBottom

            if (mAnimateNextBackgroundBottom

                    || mBottomAnimator == null && mCurrentBounds.bottom == finalBottom

                    || mBottomAnimator == null && mCurrentBounds.bottom == finalBottom

                    || mBottomAnimator != null && mEndAnimationRect.bottom == finalBottom) {

                    || mBottomAnimator != null && mEndAnimationRect.bottom == finalBottom) {
@@ -2462,7 +2461,6 @@ public class NotificationStackScrollLayout extends ViewGroup 
            } else {

            } else {

                bottom = (int) (lastView.getTranslationY() + lastView.getActualHeight()

                bottom = (int) (lastView.getTranslationY() + lastView.getActualHeight()

                        - lastView.getClipBottomAmount());

                        - lastView.getClipBottomAmount());

                bottom = Math.min(bottom, getHeight());

            }

            }

        } else {

        } else {

            top = mTopPadding;

            top = mTopPadding;
@@ -2475,7 +2473,7 @@ public class NotificationStackScrollLayout extends ViewGroup 
            top = Math.max(0, top);

            top = Math.max(0, top);

        }

        }

        mBackgroundBounds.top = top;

        mBackgroundBounds.top = top;

        mBackgroundBounds.bottom = Math.min(getHeight(), Math.max(bottom, top));

        mBackgroundBounds.bottom = Math.max(bottom, top);

    }

    }





    private ActivatableNotificationView getFirstPinnedHeadsUp() {

    private ActivatableNotificationView getFirstPinnedHeadsUp() {