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

Merge "Use the correct targets-per-row count for Landscape." into qt-dev

Browse Source 
am: 67ad0cabb2

Change-Id: Ife049d5d00de82b676bb0e5775f2d227b54bf307
This commit is contained in:
Alison Cichowlas
2019-04-12 13:52:28 -07:00
committed by android-build-merger
parent d5d18b2429 67ad0cabb2
commit 18a7ae4e78
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1427,11 +1427,9 @@ public class ChooserActivity extends ResolverActivity {
}
private void updateAlphabeticalList() {
if (getDisplayList().size() > MAX_RANKED_TARGETS) {
mSortedList.clear();
mSortedList.addAll(getDisplayList());
Collections.sort(mSortedList, new AzInfoComparator(ChooserActivity.this));
}
mSortedList.clear();
mSortedList.addAll(getDisplayList());
Collections.sort(mSortedList, new AzInfoComparator(ChooserActivity.this));
}
/**
@@ -2047,12 +2045,13 @@ public class ChooserActivity extends ResolverActivity {
@Override
public int getUnfilteredCount() {
int appTargets = super.getUnfilteredCount();
if (appTargets > MAX_RANKED_TARGETS) {
appTargets = appTargets + MAX_RANKED_TARGETS;
if (appTargets > getMaxRankedTargets()) {
appTargets = appTargets + getMaxRankedTargets();
}
return appTargets + getSelectableServiceTargetCount() + getCallerTargetCount();
}
public int getCallerTargetCount() {
return Math.min(mCallerTargets.size(), MAX_SUGGESTED_APP_TARGETS);
}
@@ -2080,14 +2079,17 @@ public class ChooserActivity extends ResolverActivity {
int getAlphaTargetCount() {
int standardCount = super.getCount();
return standardCount > MAX_RANKED_TARGETS ? standardCount : 0;
return standardCount > getMaxRankedTargets() ? standardCount : 0;
}
int getRankedTargetCount() {
int spacesAvailable = MAX_RANKED_TARGETS - getCallerTargetCount();
int spacesAvailable = getMaxRankedTargets() - getCallerTargetCount();
return Math.min(spacesAvailable, super.getCount());
}
private int getMaxRankedTargets() {
return mChooserRowAdapter == null ? 4 : mChooserRowAdapter.getMaxTargetsPerRow();
}
public int getPositionTargetType(int position) {
int offset = 0;