Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-25 19:04:26 +00:00
committed by Android (Google) Code Review
parent 9114784f35 3ed20a7555
commit 8f09cd3de1
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/app/ChooserActivity.java
View File

@@ -2327,10 +2327,12 @@ public class ChooserActivity extends ResolverActivity {
private static final int MAX_SUGGESTED_APP_TARGETS = 4; private static final int MAX_SUGGESTED_APP_TARGETS = 4;
private static final int MAX_CHOOSER_TARGETS_PER_APP = 2; 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 static final int MAX_SERVICE_TARGETS = 8;
private final int mMaxShortcutTargetsPerApp =
getResources().getInteger(R.integer.config_maxShortcutTargetsPerApp);
private int mNumShortcutResults = 0; private int mNumShortcutResults = 0;
// Reserve spots for incoming direct share targets by adding placeholders // 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); final float baseScore = getBaseScore(origTarget, isShortcutResult);
Collections.sort(targets, mBaseTargetComparator); Collections.sort(targets, mBaseTargetComparator);
final int maxTargets = isShortcutResult ? MAX_SHORTCUT_TARGETS_PER_APP final int maxTargets = isShortcutResult ? mMaxShortcutTargetsPerApp
: MAX_CHOOSER_TARGETS_PER_APP; : MAX_CHOOSER_TARGETS_PER_APP;
float lastScore = 0; float lastScore = 0;
boolean shouldNotify = false; boolean shouldNotify = false;

2
core/res/res/values/config.xml
View File

@@ -4143,4 +4143,6 @@
one bar higher than they actually are --> one bar higher than they actually are -->
<bool name="config_inflateSignalStrength">false</bool> <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> </resources>

1
core/res/res/values/symbols.xml
View File

@@ -2812,6 +2812,7 @@
<java-symbol type="layout" name="chooser_grid_preview_file" /> <java-symbol type="layout" name="chooser_grid_preview_file" />
<java-symbol type="id" name="chooser_row_text_option" /> <java-symbol type="id" name="chooser_row_text_option" />
<java-symbol type="dimen" name="chooser_row_text_option_translate" /> <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="layout" name="resolve_grid_item" />
<java-symbol type="id" name="day_picker_view_pager" /> <java-symbol type="id" name="day_picker_view_pager" />
<java-symbol type="layout" name="day_picker_content_material" /> <java-symbol type="layout" name="day_picker_content_material" />