Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e97b7bd authored by Matt Pietal's avatar Matt Pietal Committed by android-build-merger
Browse files

Merge "Sharesheet: Make max shortcut targets configurable" into qt-dev 

am: 8f09cd3d

Change-Id: I1a40f9ec9b9f196e1dd3b5eed077d0ec5dd730c7
parents d6484d11 8f09cd3d

core/java/com/android/internal/app/ChooserActivity.java

+4 −2
Original line number Diff line number Diff line
@@ -2327,10 +2327,12 @@ public class ChooserActivity extends ResolverActivity { 


        private static final int MAX_SUGGESTED_APP_TARGETS = 4;

        private static final int MAX_CHOOSER_TARGETS_PER_APP = 2;

        private static final int MAX_SHORTCUT_TARGETS_PER_APP = 8;



        private static final int MAX_SERVICE_TARGETS = 8;



        private final int mMaxShortcutTargetsPerApp =

                getResources().getInteger(R.integer.config_maxShortcutTargetsPerApp);



        private int mNumShortcutResults = 0;



        // Reserve spots for incoming direct share targets by adding placeholders
@@ -2648,7 +2650,7 @@ public class ChooserActivity extends ResolverActivity { 
            final float baseScore = getBaseScore(origTarget, isShortcutResult);

            Collections.sort(targets, mBaseTargetComparator);



            final int maxTargets = isShortcutResult ? MAX_SHORTCUT_TARGETS_PER_APP

            final int maxTargets = isShortcutResult ? mMaxShortcutTargetsPerApp

                                       : MAX_CHOOSER_TARGETS_PER_APP;

            float lastScore = 0;

            boolean shouldNotify = false;

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -4159,4 +4159,6 @@ 
         one bar higher than they actually are -->

    <bool name="config_inflateSignalStrength">false</bool>



    <!-- Sharesheet: define a max number of targets per application for new shortcuts-based direct share introduced in Q -->

    <integer name="config_maxShortcutTargetsPerApp">3</integer>

</resources>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2817,6 +2817,7 @@ 
  <java-symbol type="layout" name="chooser_grid_preview_file" />

  <java-symbol type="id" name="chooser_row_text_option" />

  <java-symbol type="dimen" name="chooser_row_text_option_translate" />

  <java-symbol type="integer" name="config_maxShortcutTargetsPerApp" />

  <java-symbol type="layout" name="resolve_grid_item" />

  <java-symbol type="id" name="day_picker_view_pager" />

  <java-symbol type="layout" name="day_picker_content_material" />