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

Change-Id: I2cbff71d1cd0f0f1421100f3aed77e69995a0b54
2020-03-25 13:31:44 +00:00
parent dbf582efb9 5cb264d9df
commit 0d9c6a8fce
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;