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

Merge "Prevent NPE when computing FastScroller position with no visible items" into lmp-mr1-dev

Browse Source
This commit is contained in:
Alan Viverette
2014-11-18 17:46:51 +00:00
committed by Android (Google) Code Review
parent b30d902ed4 827015edb3
commit 68235e4dbc
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/java/android/widget/FastScroller.java
View File

@@ -1194,17 +1194,37 @@ class FastScroller {
return MathUtils.constrain((y - offset) / range, 0f, 1f); return MathUtils.constrain((y - offset) / range, 0f, 1f);
} }
/**
* Calculates the thumb position based on the visible items.
*
* @param firstVisibleItem First visible item, >= 0.
* @param visibleItemCount Number of visible items, >= 0.
* @param totalItemCount Total number of items, >= 0.
* @return
*/
private float getPosFromItemCount( private float getPosFromItemCount(
int firstVisibleItem, int visibleItemCount, int totalItemCount) { int firstVisibleItem, int visibleItemCount, int totalItemCount) {
if (mSectionIndexer == null || mListAdapter == null) { final SectionIndexer sectionIndexer = mSectionIndexer;
if (sectionIndexer == null || mListAdapter == null) {
getSectionsFromIndexer(); getSectionsFromIndexer();
} }
final boolean hasSections = mSectionIndexer != null && mSections != null if (visibleItemCount == 0 || totalItemCount == 0) {
// No items are visible.
return 0;
}
final boolean hasSections = sectionIndexer != null && mSections != null
&& mSections.length > 0; && mSections.length > 0;
if (!hasSections || !mMatchDragPosition) { if (!hasSections || !mMatchDragPosition) {
if (visibleItemCount == totalItemCount) {
// All items are visible.
return 0;
} else {
return (float) firstVisibleItem / (totalItemCount - visibleItemCount); return (float) firstVisibleItem / (totalItemCount - visibleItemCount);
} }
}
// Ignore headers. // Ignore headers.
firstVisibleItem -= mHeaderCount; firstVisibleItem -= mHeaderCount;
if (firstVisibleItem < 0) { if (firstVisibleItem < 0) {
@@ -1222,14 +1242,14 @@ class FastScroller {
} }
// Number of rows in this section. // Number of rows in this section.
final int section = mSectionIndexer.getSectionForPosition(firstVisibleItem); final int section = sectionIndexer.getSectionForPosition(firstVisibleItem);
final int sectionPos = mSectionIndexer.getPositionForSection(section); final int sectionPos = sectionIndexer.getPositionForSection(section);
final int sectionCount = mSections.length; final int sectionCount = mSections.length;
final int positionsInSection; final int positionsInSection;
if (section < sectionCount - 1) { if (section < sectionCount - 1) {
final int nextSectionPos; final int nextSectionPos;
if (section + 1 < sectionCount) { if (section + 1 < sectionCount) {
nextSectionPos = mSectionIndexer.getPositionForSection(section + 1); nextSectionPos = sectionIndexer.getPositionForSection(section + 1);
} else { } else {
nextSectionPos = totalItemCount - 1; nextSectionPos = totalItemCount - 1;
} }