Merge "Calculare direct share expansion height only if epansion is enabled" into udc-dev

2 files changed, 7 insertions, 6 deletions

diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java
index dd0be4f0..dc9ba5ee 100644
--- a/java/src/com/android/intentresolver/ChooserActivity.java
+++ b/java/src/com/android/intentresolver/ChooserActivity.java
@@ -1512,11 +1512,12 @@ public class ChooserActivity extends ResolverActivity implements
                 rowsToShow--;
             }
 
-            boolean isExpandable = getResources().getConfiguration().orientation
-                    == Configuration.ORIENTATION_PORTRAIT && !isInMultiWindowMode();
-            if (directShareHeight != 0 && shouldShowContentPreview()
-                    && isExpandable) {
-                // make sure to leave room for direct share 4->8 expansion
+            boolean isPortrait = getResources().getConfiguration().orientation
+                    == Configuration.ORIENTATION_PORTRAIT;
+            boolean isExpandable = isPortrait && !isInMultiWindowMode()
+                    && gridAdapter.canExpandDirectShare();
+            if (directShareHeight != 0 && shouldShowContentPreview() && isExpandable) {
+                // make sure to leave room for direct share 4->8 expansion, if enabled
                 int requiredExpansionHeight =
                         (int) (directShareHeight / DIRECT_SHARE_EXPANSION_RATE);
                 int topInset = mSystemWindowInsets != null ? mSystemWindowInsets.top : 0;
diff --git a/java/src/com/android/intentresolver/grid/ChooserGridAdapter.java b/java/src/com/android/intentresolver/grid/ChooserGridAdapter.java
index 1cf59316..96f8c4d1 100644
--- a/java/src/com/android/intentresolver/grid/ChooserGridAdapter.java
+++ b/java/src/com/android/intentresolver/grid/ChooserGridAdapter.java
@@ -581,7 +581,7 @@ public final class ChooserGridAdapter extends RecyclerView.Adapter<RecyclerView.
     }
 
     /** Only expand direct share area if there is a minimum number of targets. */
-    private boolean canExpandDirectShare() {
+    public boolean canExpandDirectShare() {
         // Do not enable until we have confirmed more apps are using sharing shortcuts
         // Check git history for enablement logic
         return false;