am b7a94fd7: Merge change Ib3f6d58b into eclair
Merge commit 'b7a94fd7d66ad2cb73ed6c7226de5535935ab8b0' into eclair-mr2 * commit 'b7a94fd7d66ad2cb73ed6c7226de5535935ab8b0': Fix for 2148982: Keyboard freezes while typingmain
commit
f195bd94f3
|
@ -16,16 +16,11 @@
|
||||||
|
|
||||||
package com.android.inputmethod.latin;
|
package com.android.inputmethod.latin;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Locale;
|
|
||||||
|
|
||||||
import android.content.ContentResolver;
|
import android.content.ContentResolver;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.database.ContentObserver;
|
import android.database.ContentObserver;
|
||||||
import android.database.Cursor;
|
import android.database.Cursor;
|
||||||
import android.provider.ContactsContract.Contacts;
|
import android.provider.ContactsContract.Contacts;
|
||||||
import android.util.Log;
|
|
||||||
|
|
||||||
public class ContactsDictionary extends ExpandableDictionary {
|
public class ContactsDictionary extends ExpandableDictionary {
|
||||||
|
|
||||||
|
@ -40,6 +35,8 @@ public class ContactsDictionary extends ExpandableDictionary {
|
||||||
|
|
||||||
private boolean mRequiresReload;
|
private boolean mRequiresReload;
|
||||||
|
|
||||||
|
private long mLastLoadedContacts;
|
||||||
|
|
||||||
public ContactsDictionary(Context context) {
|
public ContactsDictionary(Context context) {
|
||||||
super(context);
|
super(context);
|
||||||
// Perform a managed query. The Activity will handle closing and requerying the cursor
|
// Perform a managed query. The Activity will handle closing and requerying the cursor
|
||||||
|
@ -64,12 +61,17 @@ public class ContactsDictionary extends ExpandableDictionary {
|
||||||
}
|
}
|
||||||
|
|
||||||
private synchronized void loadDictionary() {
|
private synchronized void loadDictionary() {
|
||||||
Cursor cursor = getContext().getContentResolver()
|
long now = android.os.SystemClock.uptimeMillis();
|
||||||
.query(Contacts.CONTENT_URI, PROJECTION, null, null, null);
|
if (mLastLoadedContacts == 0
|
||||||
if (cursor != null) {
|
|| now - mLastLoadedContacts > 30 * 60 * 1000 /* 30 minutes */) {
|
||||||
addWords(cursor);
|
Cursor cursor = getContext().getContentResolver()
|
||||||
|
.query(Contacts.CONTENT_URI, PROJECTION, null, null, null);
|
||||||
|
if (cursor != null) {
|
||||||
|
addWords(cursor);
|
||||||
|
}
|
||||||
|
mRequiresReload = false;
|
||||||
|
mLastLoadedContacts = now;
|
||||||
}
|
}
|
||||||
mRequiresReload = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue