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

Commit 13314611 authored by Alison Cichowlas's avatar Alison Cichowlas
Browse files

Use the correct targets-per-row count for Landscape. 

Bug: 126566208
Test: Manual verification, both orientations
Change-Id: I971a033628a56c41c7c926d519106114c66bce80
parent a4b089bd

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

+11 −9
Original line number Diff line number Diff line
@@ -1429,12 +1429,10 @@ 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));

    }

    }



    /**

     * Sort intents alphabetically based on display label.
@@ -2049,12 +2047,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);

        }
@@ -2082,14 +2081,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;