Merge "Fix calculation of the collapsible height" into rvc-dev am: 5cb264d9df am: 0d9c6a8fce

Change-Id: I6d051bc7fc6f14d7401ede449501084060dbd69c
2020-03-25 13:32:31 +00:00
parent 5063a4edbf 0d9c6a8fce
commit 9ac5a8106e
1 changed files with 1 additions and 1 deletions
--- a/core/java/com/android/internal/widget/ResolverDrawerLayout.java
+++ b/core/java/com/android/internal/widget/ResolverDrawerLayout.java
@@ -227,7 +227,7 @@ public class ResolverDrawerLayout extends ViewGroup {
        }

        final int oldCollapsibleHeight = mCollapsibleHeight;
-        mCollapsibleHeight = Math.max(mCollapsibleHeight, getMaxCollapsedHeight());
+        mCollapsibleHeight = Math.min(mCollapsibleHeight, getMaxCollapsedHeight());

        if (updateCollapseOffset(oldCollapsibleHeight, !isDragging())) {
            return;