Merge "Personal dictionary feeds a personal LM." (40f0f61b) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/latin/ContactsContentObserver.java

+12 −12

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.provider.ContactsContract.Contacts;
		import android.util.Log;

		import com.android.inputmethod.latin.ContactsManager.ContactsChangedListener;
		import com.android.inputmethod.latin.define.DebugFlags;
		import com.android.inputmethod.latin.utils.ExecutorUtils;

		import java.util.ArrayList;
		@@ -33,8 +34,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
		* A content observer that listens to updates to content provider {@link Contacts#CONTENT_URI}.
		*/
		public class ContactsContentObserver implements Runnable {
		private static final String TAG = ContactsContentObserver.class.getSimpleName();
		private static final boolean DEBUG = false;
		private static final String TAG = "ContactsContentObserver";
		private static AtomicBoolean sRunning = new AtomicBoolean(false);

		private final Context mContext;
		@@ -49,8 +49,8 @@ public class ContactsContentObserver implements Runnable {
		}

		public void registerObserver(final ContactsChangedListener listener) {
		if (DEBUG) {
		Log.d(TAG, "Registered Contacts Content Observer");
		if (DebugFlags.DEBUG_ENABLED) {
		Log.d(TAG, "registerObserver()");
		}
		mContactsChangedListener = listener;
		mContentObserver = new ContentObserver(null /* handler */) {
		@@ -67,13 +67,13 @@ public class ContactsContentObserver implements Runnable {
		@Override
		public void run() {
		if (!sRunning.compareAndSet(false /* expect /, true / update */)) {
		if (DEBUG) {
		if (DebugFlags.DEBUG_ENABLED) {
		Log.d(TAG, "run() : Already running. Don't waste time checking again.");
		}
		return;
		}
		if (haveContentsChanged()) {
		if (DEBUG) {
		if (DebugFlags.DEBUG_ENABLED) {
		Log.d(TAG, "run() : Contacts have changed. Notifying listeners.");
		}
		mContactsChangedListener.onContactsChange();
		@@ -91,9 +91,9 @@ public class ContactsContentObserver implements Runnable {
		return false;
		}
		if (contactCount != mManager.getContactCountAtLastRebuild()) {
		if (DEBUG) {
		Log.d(TAG, "Contact count changed: " + mManager.getContactCountAtLastRebuild()
		+ " to " + contactCount);
		if (DebugFlags.DEBUG_ENABLED) {
		Log.d(TAG, "haveContentsChanged() : Count changed from "
		+ mManager.getContactCountAtLastRebuild() + " to " + contactCount);
		}
		return true;
		}
		@@ -101,9 +101,9 @@ public class ContactsContentObserver implements Runnable {
		if (names.hashCode() != mManager.getHashCodeAtLastRebuild()) {
		return true;
		}
		if (DEBUG) {
		Log.d(TAG, "No contacts changed. (runtime = " + (SystemClock.uptimeMillis() - startTime)
		+ " ms)");
		if (DebugFlags.DEBUG_ENABLED) {
		Log.d(TAG, "haveContentsChanged() : No change detected in "
		+ (SystemClock.uptimeMillis() - startTime) + " ms)");
		}
		return false;
		}

java/src/com/android/inputmethod/latin/ContactsManager.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -35,8 +35,7 @@ import java.util.concurrent.atomic.AtomicInteger;
		* measure of the current state of the content provider.
		*/
		public class ContactsManager {
		private static final String TAG = ContactsManager.class.getSimpleName();
		private static final boolean DEBUG = false;
		private static final String TAG = "ContactsManager";

		/**
		* Interface to implement for classes interested in getting notified for updates

java/src/com/android/inputmethod/latin/DictionaryFacilitator.java

+4 −21

Original line number	Diff line number	Diff line
		@@ -45,31 +45,14 @@ public interface DictionaryFacilitator {

		public static final String[] ALL_DICTIONARY_TYPES = new String[] {
		Dictionary.TYPE_MAIN,
		Dictionary.TYPE_CONTACTS,
		Dictionary.TYPE_USER_HISTORY,
		Dictionary.TYPE_USER,
		Dictionary.TYPE_CONTACTS};
		Dictionary.TYPE_USER};

		public static final String[] DYNAMIC_DICTIONARY_TYPES = new String[] {
		Dictionary.TYPE_CONTACTS,
		Dictionary.TYPE_USER_HISTORY,
		Dictionary.TYPE_USER,
		Dictionary.TYPE_CONTACTS};

		/**
		* {@link Dictionary#TYPE_USER} is deprecated, except for the spelling service.
		*/
		public static final String[] DICTIONARY_TYPES_FOR_SPELLING = new String[] {
		Dictionary.TYPE_MAIN,
		Dictionary.TYPE_USER_HISTORY,
		Dictionary.TYPE_USER,
		Dictionary.TYPE_CONTACTS};

		/**
		* {@link Dictionary#TYPE_USER} is deprecated, except for the spelling service.
		*/
		public static final String[] DICTIONARY_TYPES_FOR_SUGGESTIONS = new String[] {
		Dictionary.TYPE_MAIN,
		Dictionary.TYPE_USER_HISTORY,
		Dictionary.TYPE_CONTACTS};
		Dictionary.TYPE_USER};

		/**
		* Returns whether this facilitator is exactly for this locale.

java/src/com/android/inputmethod/latin/DictionaryFacilitatorImpl.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -557,7 +557,7 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator {
		false /* firstSuggestionExceedsConfidenceThreshold */);
		final float[] weightOfLangModelVsSpatialModel =
		new float[] { Dictionary.NOT_A_WEIGHT_OF_LANG_MODEL_VS_SPATIAL_MODEL };
		for (final String dictType : DICTIONARY_TYPES_FOR_SUGGESTIONS) {
		for (final String dictType : ALL_DICTIONARY_TYPES) {
		final Dictionary dictionary = mDictionaryGroup.getDict(dictType);
		if (null == dictionary) continue;
		final float weightForLocale = composedData.mIsBatchMode
		@@ -577,11 +577,11 @@ public class DictionaryFacilitatorImpl implements DictionaryFacilitator {
		}

		public boolean isValidSpellingWord(final String word) {
		return isValidWord(word, DICTIONARY_TYPES_FOR_SPELLING);
		return isValidWord(word, ALL_DICTIONARY_TYPES);
		}

		public boolean isValidSuggestionWord(final String word) {
		return isValidWord(word, DICTIONARY_TYPES_FOR_SUGGESTIONS);
		return isValidWord(word, ALL_DICTIONARY_TYPES);
		}

		private boolean isValidWord(final String word, final String[] dictionariesToCheck) {

java/src/com/android/inputmethod/latin/UserDictionaryLookup.java→java/src/com/android/inputmethod/latin/PersonalDictionaryLookup.java

+225 −114

File changed and moved.

Preview size limit exceeded, changes collapsed.