From 685a1766c2b7890107824cf765e446696eeb4474 Mon Sep 17 00:00:00 2001
From: arangelov <arangelov@google.com>
Date: Tue, 24 Mar 2020 13:11:39 +0000
Subject: [PATCH] Fix calculation of the collapsible height

Test: manual
Fixes: 146654842
Change-Id: Ia63fcbb654218a2972596f19c409028db71dab79
---
 core/java/com/android/internal/widget/ResolverDrawerLayout.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/widget/ResolverDrawerLayout.java b/core/java/com/android/internal/widget/ResolverDrawerLayout.java
index c83cab77dd130..31527e8dbe5d4 100644
--- 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;