diff --git a/src/ui/android/AndroidManifest.xml b/src/ui/android/AndroidManifest.xml index 25c85c52b..0752ab2c9 100644 --- a/src/ui/android/AndroidManifest.xml +++ b/src/ui/android/AndroidManifest.xml @@ -26,6 +26,7 @@ + diff --git a/src/ui/android/assets/help_content.html b/src/ui/android/assets/help_content.html new file mode 100644 index 000000000..8d0e37970 --- /dev/null +++ b/src/ui/android/assets/help_content.html @@ -0,0 +1,5 @@ + + +

Sorry, we can't help you

+ + diff --git a/src/ui/android/res/menu/main.xml b/src/ui/android/res/menu/main.xml index 0f628e334..7f5a4c4f7 100644 --- a/src/ui/android/res/menu/main.xml +++ b/src/ui/android/res/menu/main.xml @@ -1,4 +1,6 @@ + diff --git a/src/ui/android/res/values/strings.xml b/src/ui/android/res/values/strings.xml index 06303d412..768ef60a4 100644 --- a/src/ui/android/res/values/strings.xml +++ b/src/ui/android/res/values/strings.xml @@ -7,6 +7,7 @@ Opening Speech Input Keyboard Input + Help org.grammaticalframework.ui.android.GLOBAL_PREFERENCES diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java b/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java index ce8d16190..11cac6c25 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java @@ -185,6 +185,10 @@ public class MainActivity extends Activity { editor.commit(); return true; + case R.id.help: + Intent myIntent = new Intent(MainActivity.this, HelpActivity.class); + MainActivity.this.startActivity(myIntent); + return true; default: return super.onOptionsItemSelected(item); } diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java b/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java index 61e2437b4..c1fd3b485 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java @@ -2,8 +2,6 @@ package org.grammaticalframework.ui.android; import android.content.Context; import android.content.SharedPreferences; -import android.content.res.XmlResourceParser; -import android.text.TextUtils; import android.util.Log; import android.view.inputmethod.CompletionInfo; @@ -13,18 +11,13 @@ import org.grammaticalframework.pgf.FullFormEntry; import org.grammaticalframework.pgf.MorphoAnalysis; import org.grammaticalframework.pgf.PGF; import org.grammaticalframework.pgf.ParseError; -import org.xmlpull.v1.XmlPullParserException; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.Comparator; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.PriorityQueue; public class Translator {