Merge "Sharesheet - Disable expansion" into rvc-dev am: dc9a555126 am: 2606c5f859

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820086

Change-Id: Ib41f5fe5de77c27f862deff43ff7f05f821c88ec

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() {