diff options
14 files changed, 13 insertions, 13 deletions
diff --git a/src/ui/android/.project b/src/ui/android/.project index bde0bfac1..abf063e43 100644 --- a/src/ui/android/.project +++ b/src/ui/android/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>HLCompiler</name> + <name>GFTranslator</name> <comment></comment> <projects> </projects> diff --git a/src/ui/android/AndroidManifest.xml b/src/ui/android/AndroidManifest.xml index f8fa83a49..a2127be9c 100644 --- a/src/ui/android/AndroidManifest.xml +++ b/src/ui/android/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.grammaticalframework.ui.android" - android:versionCode="2" - android:versionName="1.0" + android:versionCode="3" + android:versionName="1.1" android:installLocation="auto" > <uses-sdk @@ -15,7 +15,7 @@ android:allowBackup="true" android:icon="@drawable/ic_app" android:label="@string/app_name" - android:theme="@style/AppTheme" android:name="HLCompiler"> + android:theme="@style/AppTheme" android:name="GFTranslator"> <activity android:name=".MainActivity" android:label="@string/app_name" > diff --git a/src/ui/android/project.properties b/src/ui/android/project.properties index 6e18427a4..3409f0811 100644 --- a/src/ui/android/project.properties +++ b/src/ui/android/project.properties @@ -11,4 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-21 +target=android-20 diff --git a/src/ui/android/res/drawable-hdpi/ic_app.png b/src/ui/android/res/drawable-hdpi/ic_app.png Binary files differindex 6760bc456..8d9bdd820 100644 --- a/src/ui/android/res/drawable-hdpi/ic_app.png +++ b/src/ui/android/res/drawable-hdpi/ic_app.png diff --git a/src/ui/android/res/drawable-mdpi/ic_app.png b/src/ui/android/res/drawable-mdpi/ic_app.png Binary files differindex 99aaf67bc..923d0fe91 100644 --- a/src/ui/android/res/drawable-mdpi/ic_app.png +++ b/src/ui/android/res/drawable-mdpi/ic_app.png diff --git a/src/ui/android/res/drawable-xhdpi/ic_app.png b/src/ui/android/res/drawable-xhdpi/ic_app.png Binary files differindex a6d509f71..f7eb06682 100644 --- a/src/ui/android/res/drawable-xhdpi/ic_app.png +++ b/src/ui/android/res/drawable-xhdpi/ic_app.png diff --git a/src/ui/android/res/drawable-xxhdpi/ic_app.png b/src/ui/android/res/drawable-xxhdpi/ic_app.png Binary files differindex d51650e25..6154d852a 100644 --- a/src/ui/android/res/drawable-xxhdpi/ic_app.png +++ b/src/ui/android/res/drawable-xxhdpi/ic_app.png diff --git a/src/ui/android/res/values/strings.xml b/src/ui/android/res/values/strings.xml index 26db54a03..ca103623e 100644 --- a/src/ui/android/res/values/strings.xml +++ b/src/ui/android/res/values/strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Human Language Compiler</string> + <string name="app_name">GF Offline Translator</string> <string name="microphone">Microphone</string> <string name="switch_languages">Switch languages</string> diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/AlternativesActivity.java b/src/ui/android/src/org/grammaticalframework/ui/android/AlternativesActivity.java index 0bebbc3ea..e5d691820 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/AlternativesActivity.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/AlternativesActivity.java @@ -33,7 +33,7 @@ public class AlternativesActivity extends ListActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_lexical_entry); - mTranslator = ((HLCompiler) getApplicationContext()).getTranslator(); + mTranslator = ((GFTranslator) getApplicationContext()).getTranslator(); mShowLanguageView = (LanguageSelector) findViewById(R.id.show_language); mShowLanguageView.setLanguages(mTranslator.getAvailableLanguages()); diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/HLCompiler.java b/src/ui/android/src/org/grammaticalframework/ui/android/GFTranslator.java index 2e5b16df4..ee4cbc092 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/HLCompiler.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/GFTranslator.java @@ -2,7 +2,7 @@ package org.grammaticalframework.ui.android; import android.app.Application; -public class HLCompiler extends Application { +public class GFTranslator extends Application { private Translator mTranslator; @Override 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 f448efb44..1d0bcd592 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java @@ -103,7 +103,7 @@ public class MainActivity extends Activity { mTts = new TTS(this); - mTranslator = ((HLCompiler) getApplicationContext()).getTranslator(); + mTranslator = ((GFTranslator) getApplicationContext()).getTranslator(); mSourceLanguageView.setLanguages(mTranslator.getAvailableLanguages()); mSourceLanguageView.setOnLanguageSelectedListener(new OnLanguageSelectedListener() { diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java index 58d2e6518..d621e2f69 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java @@ -41,7 +41,7 @@ public class TranslatorInputMethodService extends InputMethodService public void onCreate() { super.onCreate(); - mTranslator = ((HLCompiler) getApplicationContext()).getTranslator(); + mTranslator = ((GFTranslator) getApplicationContext()).getTranslator(); mSymbolsPage1Keyboard = null; mSymbolsPage2Keyboard = null; diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboard.java b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboard.java index 3eeb1be1e..876f660da 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboard.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboard.java @@ -24,7 +24,7 @@ public class TranslatorKeyboard extends Keyboard { public TranslatorKeyboard(Context context, int xmlLayoutResId, int modeId) { super(context, xmlLayoutResId, modeId); - mTranslator = ((HLCompiler) context.getApplicationContext()).getTranslator(); + mTranslator = ((GFTranslator) context.getApplicationContext()).getTranslator(); updateLanguageKeyLabels(); } diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboardView.java b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboardView.java index 8e05623f5..943c48d35 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboardView.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboardView.java @@ -20,12 +20,12 @@ public class TranslatorKeyboardView extends KeyboardView { public TranslatorKeyboardView(Context context, AttributeSet attrs) { super(context, attrs); - mTranslator = ((HLCompiler) context.getApplicationContext()).getTranslator(); + mTranslator = ((GFTranslator) context.getApplicationContext()).getTranslator(); } public TranslatorKeyboardView(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); - mTranslator = ((HLCompiler) context.getApplicationContext()).getTranslator(); + mTranslator = ((GFTranslator) context.getApplicationContext()).getTranslator(); } private PopupWindow mLanguagesPopup = null; |
