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

am ec69a259: Merge "Open an API in ExternalDictionaryGetterForDebug"

Browse source 
* commit 'ec69a259c60b89cfe5157dc6b43aa17f2f60d6ca':
  Open an API in ExternalDictionaryGetterForDebug
This commit is contained in:
Satoshi Kataoka 2013-06-27 03:33:33 -07:00 committed by Android Git Automerger
commit 2221b89564
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
java/src/com/android/inputmethod/latin/ExternalDictionaryGetterForDebug.java
View file

@ -19,6 +19,7 @@ package com.android.inputmethod.latin;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.DialogInterface.OnCancelListener;
import android.content.DialogInterface.OnClickListener; import android.content.DialogInterface.OnClickListener;
import android.os.Environment; import android.os.Environment;
@ -59,7 +60,7 @@ public class ExternalDictionaryGetterForDebug {
if (0 == fileNames.length) { if (0 == fileNames.length) {
showNoFileDialog(context); showNoFileDialog(context);
} else if (1 == fileNames.length) { } else if (1 == fileNames.length) {
askInstallFile(context, fileNames[0]); askInstallFile(context, SOURCE_FOLDER, fileNames[0], null /* completeRunnable */);
} else { } else {
showChooseFileDialog(context, fileNames); showChooseFileDialog(context, fileNames);
} }
@ -82,14 +83,19 @@ public class ExternalDictionaryGetterForDebug {
.setItems(fileNames, new OnClickListener() { .setItems(fileNames, new OnClickListener() {
@Override @Override
public void onClick(final DialogInterface dialog, final int which) { public void onClick(final DialogInterface dialog, final int which) {
askInstallFile(context, fileNames[which]); askInstallFile(context, SOURCE_FOLDER, fileNames[which],
null /* completeRunnable */);
} }
}) })
.create().show(); .create().show();
} }
private static void askInstallFile(final Context context, final String fileName) { /**
final File file = new File(SOURCE_FOLDER, fileName.toString()); * Shows a dialog which offers the user to install the external dictionary.
*/
public static void askInstallFile(final Context context, final String dirPath,
final String fileName, final Runnable completeRunnable) {
final File file = new File(dirPath, fileName.toString());
final FileHeader header = DictionaryInfoUtils.getDictionaryFileHeaderOrNull(file); final FileHeader header = DictionaryInfoUtils.getDictionaryFileHeaderOrNull(file);
final StringBuilder message = new StringBuilder(); final StringBuilder message = new StringBuilder();
final String locale = header.getLocaleString(); final String locale = header.getLocaleString();
@ -109,12 +115,26 @@ public class ExternalDictionaryGetterForDebug {
@Override @Override
public void onClick(final DialogInterface dialog, final int which) { public void onClick(final DialogInterface dialog, final int which) {
dialog.dismiss(); dialog.dismiss();
if (completeRunnable != null) {
completeRunnable.run();
}
} }
}).setPositiveButton(android.R.string.ok, new OnClickListener() { }).setPositiveButton(android.R.string.ok, new OnClickListener() {
@Override @Override
public void onClick(final DialogInterface dialog, final int which) { public void onClick(final DialogInterface dialog, final int which) {
installFile(context, file, header); installFile(context, file, header);
dialog.dismiss(); dialog.dismiss();
if (completeRunnable != null) {
completeRunnable.run();
}
}
}).setOnCancelListener(new OnCancelListener() {
@Override
public void onCancel(DialogInterface dialog) {
// Canceled by the user by hitting the back key
if (completeRunnable != null) {
completeRunnable.run();
}
} }
}).create().show(); }).create().show();
} }