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

Commit 6d54f81a authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Preserve ResolverDrawerLayout fully collapsed state across relayout" into mnc-dev

parents f02c7d43 c9f22934

core/java/com/android/internal/widget/ResolverDrawerLayout.java

+8 −1
Original line number Diff line number Diff line
@@ -661,13 +661,20 @@ public class ResolverDrawerLayout extends ViewGroup { 
            }

        }



        final int oldCollapsibleHeight = mCollapsibleHeight;

        mCollapsibleHeight = Math.max(0,

                heightUsed - alwaysShowHeight - getMaxCollapsedHeight());

        mUncollapsibleHeight = heightUsed - mCollapsibleHeight;



        if (isLaidOut()) {

            final boolean isCollapsedOld = mCollapseOffset != 0;

            if (oldCollapsibleHeight < mCollapsibleHeight

                    && mCollapseOffset == oldCollapsibleHeight) {

                // Stay closed even at the new height.

                mCollapseOffset = mCollapsibleHeight;

            } else {

                mCollapseOffset = Math.min(mCollapseOffset, mCollapsibleHeight);

            }

            final boolean isCollapsedNew = mCollapseOffset != 0;

            if (isCollapsedOld != isCollapsedNew) {

                notifyViewAccessibilityStateChangedIfNeeded(