Merge change Ib3f6d58b into eclair

package com.android.inputmethod.latin;

import java.util.ArrayList;

import java.util.List;

import java.util.Locale;

import android.content.ContentResolver;

import android.content.Context;

import android.database.ContentObserver;

import android.database.Cursor;

import android.provider.ContactsContract.Contacts;

import android.util.Log;

public class ContactsDictionary extends ExpandableDictionary {

    private boolean mRequiresReload;

    private long mLastLoadedContacts;

    public ContactsDictionary(Context context) {

        super(context);

        // Perform a managed query. The Activity will handle closing and requerying the cursor

    }

    private synchronized void loadDictionary() {

        long now = android.os.SystemClock.uptimeMillis();

        if (mLastLoadedContacts == 0

                || now - mLastLoadedContacts > 30 * 60 * 1000 /* 30 minutes */) {

            Cursor cursor = getContext().getContentResolver()

                    .query(Contacts.CONTENT_URI, PROJECTION, null, null, null);

            if (cursor != null) {

                addWords(cursor);

            }

            mRequiresReload = false;

            mLastLoadedContacts = now;

        }

    }

    @Override