From 685ccbda8be7471bdf068e2ecb34d00ff6e9deb9 Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Fri, 11 Oct 2013 08:16:51 +0000 Subject: [PATCH] synchronize the target languages in the main activity with the one in the lexicon activity --- .../ui/android/LexicalEntryActivity.java | 9 ++++++++- .../grammaticalframework/ui/android/MainActivity.java | 8 ++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java b/src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java index a8717c1aa..393a854cf 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java @@ -43,7 +43,14 @@ public class LexicalEntryActivity extends ListActivity { updateTranslations(); } - + + @Override + protected void onResume() { + super.onResume(); + + mShowLanguageView.setSelectedLanguage(mTranslator.getTargetLanguage()); + } + private void updateTranslations() { @SuppressWarnings("unchecked") List list = (List) 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 c312d7aad..9efd841f1 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java @@ -106,6 +106,14 @@ public class MainActivity extends Activity { }); } + @Override + protected void onResume() { + super.onResume(); + + mSourceLanguageView.setSelectedLanguage(mTranslator.getSourceLanguage()); + mTargetLanguageView.setSelectedLanguage(mTranslator.getTargetLanguage()); + } + @Override protected void onDestroy() { if (mAsr != null) {