From 185f715e77d2c144c62370dfc2bc8a95bd904dcc Mon Sep 17 00:00:00 2001
From: Matt Pietal <mpietal@google.com>
Date: Wed, 10 Jun 2020 11:40:55 -0400
Subject: [PATCH] Sharesheet - Disable expansion

Leave disabled until more apps are using sharing shortcuts

Fixes: 157065816
Test: atest ChooserActivityTest
Change-Id: I7f8811617fe2f3a77f86b8459c7f06b0929a40c9
---
 core/java/com/android/internal/app/ChooserActivity.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index 2d4d9575584d8..67c97ae291863 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -3592,10 +3592,9 @@ public class ChooserActivity extends ResolverActivity implements
          * Only expand direct share area if there is a minimum number of targets.
          */
         private boolean canExpandDirectShare() {
-            int orientation = getResources().getConfiguration().orientation;
-            return mChooserListAdapter.getNumServiceTargetsForExpand() > getMaxTargetsPerRow()
-                    && orientation == Configuration.ORIENTATION_PORTRAIT
-                    && !isInMultiWindowMode();
+            // Do not enable until we have confirmed more apps are using sharing shortcuts
+            // Check git history for enablement logic
+            return false;
         }
 
         public ChooserListAdapter getListAdapter() {