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

Commit 414b0238 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

resolved conflicts for merge of 9058a6c8 to master 

Change-Id: I361773dac17a551dd7b4c0b0e4e649ddf7612d90
parents 0a84ca2b 9058a6c8

core/java/android/widget/FastScroller.java

+6 −1
Original line number Diff line number Diff line
@@ -1037,7 +1037,12 @@ class FastScroller { 
        final int sectionCount = mSections.length;

        final int positionsInSection;

        if (section < sectionCount - 1) {

            final int nextSectionPos = mSectionIndexer.getPositionForSection(section + 1);

            final int nextSectionPos;

            if (section + 1 < sectionCount) {

                nextSectionPos = mSectionIndexer.getPositionForSection(section + 1);

            } else {

                nextSectionPos = totalItemCount - 1;

            }

            positionsInSection = nextSectionPos - sectionPos;

        } else {

            positionsInSection = totalItemCount - sectionPos;