From a69e67638bada12edcef5d3c2db43890ed7f8711 Mon Sep 17 00:00:00 2001 From: arangelov Date: Wed, 5 Feb 2020 21:25:15 +0000 Subject: [PATCH] Add the tabs height when determining the height of the share sheet Test: atest com.android.internal.app.ResolverActivityTest Test: atest com.android.internal.app.ChooserActivityTest Bug: 142537267 Bug: 142538125 Change-Id: I056730d69163591a84d7c3b70c52a646579c8830 --- core/java/com/android/internal/app/ChooserActivity.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index a43e4fe118a96..65cad834d5be0 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -2424,6 +2424,10 @@ public class ChooserActivity extends ResolverActivity implements offset += findViewById(R.id.content_preview_container).getHeight(); } + if (hasWorkProfile() && ENABLE_TABBED_VIEW) { + offset += findViewById(R.id.tabs).getHeight(); + } + int directShareHeight = 0; rowsToShow = Math.min(4, rowsToShow); for (int i = 0, childCount = recyclerView.getChildCount();