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

Commit 8300235b authored by Dan Sandler's avatar Dan Sandler
Browse files

resolve merge conflicts of 9c9b26fb to master 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia32b6803d06a99dc3f75fd63a96302928d29ce1c
parents 82e696d5 9c9b26fb

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

+3 −0
Original line number Diff line number Diff line
@@ -4172,6 +4172,9 @@ 
         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>



    <!-- The package name for the vendor implementation of ACTION_FACTORY_RESET. For some vendors,

    the default implementation of ACTION_FACTORY_RESET does not work, so it is needed to re-route

    this intent to this package. This is being used in MasterClearReceiver.java. -->

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2813,6 +2813,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" />