nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

am e72d1a07: Merge "Allow downloadable dictionaries in development builds"

Browse source 
* commit 'e72d1a07b6c52e3bcc7f099c81a14dab2fadf459':
  Allow downloadable dictionaries in development builds
This commit is contained in:
Kurt Partridge 2013-06-12 14:25:22 -07:00 committed by Android Git Automerger
commit 681f123968
3 changed files with 17 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java
View file

@ -290,16 +290,12 @@ final class BinaryDictionaryGetter {
final Context context) { final Context context) {
final boolean hasDefaultWordList = DictionaryFactory.isDictionaryAvailable(context, locale); final boolean hasDefaultWordList = DictionaryFactory.isDictionaryAvailable(context, locale);
// TODO: The development-only-diagnostic version is not supported by the Dictionary Pack // We need internet access to do the following. Only do this if the package actually
// Service yet // has the permission.
if (!ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) { if (context.checkCallingOrSelfPermission(android.Manifest.permission.INTERNET)
// We need internet access to do the following. Only do this if the package actually == PackageManager.PERMISSION_GRANTED) {
// has the permission. BinaryDictionaryFileDumper.cacheWordListsFromContentProvider(locale, context,
if (context.checkCallingOrSelfPermission(android.Manifest.permission.INTERNET) hasDefaultWordList);
== PackageManager.PERMISSION_GRANTED) {
BinaryDictionaryFileDumper.cacheWordListsFromContentProvider(locale, context,
hasDefaultWordList);
}
} }
final File[] cachedWordLists = getCachedWordLists(locale.toString(), context); final File[] cachedWordLists = getCachedWordLists(locale.toString(), context);
final String mainDictId = DictionaryInfoUtils.getMainDictId(locale); final String mainDictId = DictionaryInfoUtils.getMainDictId(locale);

31
java/src/com/android/inputmethod/latin/LatinIME.java
View file

@ -179,11 +179,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
private int mDisplayOrientation; private int mDisplayOrientation;
// Object for reacting to adding/removing a dictionary pack. // Object for reacting to adding/removing a dictionary pack.
// TODO: The development-only-diagnostic version is not supported by the Dictionary Pack
// Service yet.
private BroadcastReceiver mDictionaryPackInstallReceiver = private BroadcastReceiver mDictionaryPackInstallReceiver =
ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS new DictionaryPackInstallBroadcastReceiver(this);
? null : new DictionaryPackInstallBroadcastReceiver(this);
// Keeps track of most recently inserted text (multi-character key) for reverting // Keeps track of most recently inserted text (multi-character key) for reverting
private String mEnteredText; private String mEnteredText;
@ -458,19 +455,15 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION); filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);
registerReceiver(mReceiver, filter); registerReceiver(mReceiver, filter);
// TODO: The development-only-diagnostic version is not supported by the Dictionary Pack final IntentFilter packageFilter = new IntentFilter();
// Service yet. packageFilter.addAction(Intent.ACTION_PACKAGE_ADDED);
if (!ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) { packageFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
final IntentFilter packageFilter = new IntentFilter(); packageFilter.addDataScheme(SCHEME_PACKAGE);
packageFilter.addAction(Intent.ACTION_PACKAGE_ADDED); registerReceiver(mDictionaryPackInstallReceiver, packageFilter);
packageFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
packageFilter.addDataScheme(SCHEME_PACKAGE);
registerReceiver(mDictionaryPackInstallReceiver, packageFilter);
final IntentFilter newDictFilter = new IntentFilter(); final IntentFilter newDictFilter = new IntentFilter();
newDictFilter.addAction(DictionaryPackConstants.NEW_DICTIONARY_INTENT_ACTION); newDictFilter.addAction(DictionaryPackConstants.NEW_DICTIONARY_INTENT_ACTION);
registerReceiver(mDictionaryPackInstallReceiver, newDictFilter); registerReceiver(mDictionaryPackInstallReceiver, newDictFilter);
}
} }
// Has to be package-visible for unit tests // Has to be package-visible for unit tests
@ -587,11 +580,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) { if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
ResearchLogger.getInstance().onDestroy(); ResearchLogger.getInstance().onDestroy();
} }
// TODO: The development-only-diagnostic version is not supported by the Dictionary Pack unregisterReceiver(mDictionaryPackInstallReceiver);
// Service yet.
if (!ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
unregisterReceiver(mDictionaryPackInstallReceiver);
}
LatinImeLogger.commit(); LatinImeLogger.commit();
LatinImeLogger.onDestroy(); LatinImeLogger.onDestroy();
super.onDestroy(); super.onDestroy();

4
java/src/com/android/inputmethod/latin/SettingsFragment.java
View file

@ -202,9 +202,7 @@ public final class SettingsFragment extends InputMethodSettingsFragment
final Intent intent = dictionaryLink.getIntent(); final Intent intent = dictionaryLink.getIntent();
intent.setClassName(context.getPackageName(), DictionarySettingsActivity.class.getName()); intent.setClassName(context.getPackageName(), DictionarySettingsActivity.class.getName());
final int number = context.getPackageManager().queryIntentActivities(intent, 0).size(); final int number = context.getPackageManager().queryIntentActivities(intent, 0).size();
// TODO: The development-only-diagnostic version is not supported by the Dictionary Pack if (0 >= number) {
// Service yet
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS || 0 >= number) {
textCorrectionGroup.removePreference(dictionaryLink); textCorrectionGroup.removePreference(dictionaryLink);
} }