diff --git a/src/ui/android/.classpath b/src/ui/android/.classpath
index 6e9239ff0..48f4f566f 100644
--- a/src/ui/android/.classpath
+++ b/src/ui/android/.classpath
@@ -1,7 +1,10 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/ui/android/.project b/src/ui/android/.project
index c24012a32..abf063e43 100644
--- a/src/ui/android/.project
+++ b/src/ui/android/.project
@@ -1,33 +1,33 @@
-
-
- GF-Android
-
-
-
-
-
- com.android.ide.eclipse.adt.ResourceManagerBuilder
-
-
-
-
- com.android.ide.eclipse.adt.PreCompilerBuilder
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- com.android.ide.eclipse.adt.ApkBuilder
-
-
-
-
-
- com.android.ide.eclipse.adt.AndroidNature
- org.eclipse.jdt.core.javanature
-
-
+
+
+ GFTranslator
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/src/ui/android/AndroidManifest.xml b/src/ui/android/AndroidManifest.xml
index 7188f74b3..6f48b1186 100644
--- a/src/ui/android/AndroidManifest.xml
+++ b/src/ui/android/AndroidManifest.xml
@@ -1,18 +1,27 @@
-
-
+ package="org.grammaticalframework.ui.android"
+ android:versionCode="1"
+ android:versionName="1.0" >
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+
diff --git a/src/ui/android/default.properties b/src/ui/android/default.properties
deleted file mode 100644
index 19c96655d..000000000
--- a/src/ui/android/default.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Indicates whether an apk should be generated for each density.
-split.density=false
-# Project target.
-target=android-4
diff --git a/src/ui/android/project.properties b/src/ui/android/project.properties
new file mode 100644
index 000000000..ce39f2d0a
--- /dev/null
+++ b/src/ui/android/project.properties
@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-18
diff --git a/src/ui/android/res/layout/main.xml b/src/ui/android/res/layout/main.xml
deleted file mode 100644
index 67ce499fb..000000000
--- a/src/ui/android/res/layout/main.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/ui/android/res/values/strings.xml b/src/ui/android/res/values/strings.xml
index 662c708c1..0d7b9a606 100644
--- a/src/ui/android/res/values/strings.xml
+++ b/src/ui/android/res/values/strings.xml
@@ -1,5 +1,8 @@
- Hello World, FridgeMagnets!
- Fridge Magnets
+
+ GFTranslator
+ Settings
+ Hello world!
+
diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/FridgeMagnets.java b/src/ui/android/src/org/grammaticalframework/ui/android/FridgeMagnets.java
deleted file mode 100644
index d1262e7bb..000000000
--- a/src/ui/android/src/org/grammaticalframework/ui/android/FridgeMagnets.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package org.grammaticalframework.ui.android;
-
-import java.util.Arrays;
-
-import android.os.*;
-import android.app.*;
-import android.content.*;
-import android.text.*;
-import android.view.*;
-import android.view.inputmethod.*;
-import android.widget.*;
-import android.graphics.*;
-import se.fnord.android.layout.*;
-
-public class FridgeMagnets extends Activity {
- /** Called when the activity is first created. */
- String[] words = {"hello","buy","I","you","have","please","where",
- "how","go","Gothenburg","London","rakia","wine",
- "whisky","man","woman","boy","girl","to"};
-
- private Controller controller = new Controller();
- private EditText searchBox = null;
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.main);
-
- Arrays.sort(words);
-
- refreshBagOfWords(null);
-
- View main = findViewById(R.id.main_view);
- main.setFocusableInTouchMode(true);
- main.setOnKeyListener(controller);
- }
-
- private void applyMagnetStyles(TextView view) {
- view.setTextColor(Color.BLACK);
- view.setBackgroundColor(Color.WHITE);
- view.setSingleLine(true);
- view.setPadding(2, 2, 2, 2);
- view.setClickable(true);
- }
-
- private void refreshBagOfWords(String prefix) {
- PredicateLayout l = (PredicateLayout) findViewById(R.id.magnets_bag);
-
- l.removeAllViews();
-
- for (int i = 0; i < words.length; i++) {
- if (prefix != null && !words[i].startsWith(prefix))
- continue;
-
- TextView t = new TextView(this);
- t.setText(words[i]);
- t.setOnTouchListener(controller);
- applyMagnetStyles(t);
- l.addView(t, new PredicateLayout.LayoutParams(3, 3));
- }
- }
-
- private void addWord(String word) {
- PredicateLayout l = (PredicateLayout) findViewById(R.id.magnets_sentence);
-
- TextView t = new TextView(this);
- t.setText(word);
- applyMagnetStyles(t);
- l.addView(t, new PredicateLayout.LayoutParams(3, 3));
- }
-
- private void showSearchBox() {
- if (searchBox != null)
- return;
-
- PredicateLayout l = (PredicateLayout) findViewById(R.id.magnets_sentence);
-
- EditText edit = new EditText(this);
- edit.setInputType(InputType.TYPE_CLASS_TEXT |
- InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE);
- edit.addTextChangedListener(controller);
- edit.setOnKeyListener(controller);
- applyMagnetStyles(edit);
-
- l.addView(edit, new PredicateLayout.LayoutParams(
- ViewGroup.LayoutParams.WRAP_CONTENT,
- ViewGroup.LayoutParams.WRAP_CONTENT,
- 3, 3));
- edit.requestFocus();
- InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
- imm.showSoftInput(edit, 0);
-
- searchBox = edit;
- }
-
- private void hideSearchBox() {
- if (searchBox == null)
- return;
-
- InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
- imm.hideSoftInputFromWindow(searchBox.getWindowToken(), 0);
-
- PredicateLayout l = (PredicateLayout) findViewById(R.id.magnets_sentence);
- l.removeView(searchBox);
-
- refreshBagOfWords(null);
-
- searchBox = null;
- }
-
- private class Controller implements View.OnKeyListener, View.OnTouchListener, TextWatcher {
-
- @Override
- public boolean onKey(View view, int keyCode, KeyEvent event) {
- if (event.getAction() == KeyEvent.ACTION_DOWN) {
- if (searchBox == null && keyCode == KeyEvent.KEYCODE_SEARCH) {
- showSearchBox();
- return true;
- } else if (searchBox != null && keyCode == KeyEvent.KEYCODE_SEARCH) {
- hideSearchBox();
- return true;
- }
- }
- return false;
- }
-
- @Override
- public boolean onTouch(View view, MotionEvent event) {
- if (event.getAction() == MotionEvent.ACTION_UP) {
- hideSearchBox();
- addWord(((TextView) view).getText().toString());
- return true;
- }
-
- return false;
- }
-
- @Override
- public void afterTextChanged(Editable arg0) {
- }
-
- @Override
- public void beforeTextChanged(CharSequence arg0, int arg1, int arg2, int arg3) {
- }
-
- @Override
- public void onTextChanged(CharSequence text, int arg1, int arg2, int arg3) {
- refreshBagOfWords(text.toString());
- }
- }
-}
\ No newline at end of file