drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am eb4dc749: am 6d0d4b5b: Merge "Mask OOBE when filtering recent documents." into klp-dev

Browse Source 
* commit 'eb4dc749de7f6ee45cae070db960890643e94aff':
  Mask OOBE when filtering recent documents.
This commit is contained in:
Jeff Sharkey
2013-11-19 00:13:26 -08:00
committed by Android Git Automerger
parent a9249322d5 eb4dc749de
commit 37ba54ac13
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/DocumentsUI/src/com/android/documentsui/FilteringCursorWrapper.java
View File

@ -51,7 +51,7 @@ public class FilteringCursorWrapper extends AbstractCursor {
mPosition = new int[count]; mPosition = new int[count];
cursor.moveToPosition(-1); cursor.moveToPosition(-1);
while (cursor.moveToNext()) { while (cursor.moveToNext() && mCount < count) {
final String mimeType = getCursorString(cursor, Document.COLUMN_MIME_TYPE); final String mimeType = getCursorString(cursor, Document.COLUMN_MIME_TYPE);
final long lastModified = getCursorLong(cursor, Document.COLUMN_LAST_MODIFIED); final long lastModified = getCursorLong(cursor, Document.COLUMN_LAST_MODIFIED);
if (rejectMimes != null && MimePredicate.mimeMatches(rejectMimes, mimeType)) { if (rejectMimes != null && MimePredicate.mimeMatches(rejectMimes, mimeType)) {

4
packages/DocumentsUI/src/com/android/documentsui/RecentLoader.java
View File

@ -55,6 +55,10 @@ import java.util.concurrent.TimeUnit;
public class RecentLoader extends AsyncTaskLoader<DirectoryResult> { public class RecentLoader extends AsyncTaskLoader<DirectoryResult> {
private static final boolean LOGD = true; private static final boolean LOGD = true;
// TODO: clean up cursor ownership so background thread doesn't traverse
// previously returned cursors for filtering/sorting; this currently races
// with the UI thread.
private static final int MAX_OUTSTANDING_RECENTS = 4; private static final int MAX_OUTSTANDING_RECENTS = 4;
private static final int MAX_OUTSTANDING_RECENTS_SVELTE = 2; private static final int MAX_OUTSTANDING_RECENTS_SVELTE = 2;