diff --git a/src/ui/android/res/layout/activity_lexical_entry.xml b/src/ui/android/res/layout/activity_lexical_entry.xml
index 55bf51059..0dc7fc7be 100644
--- a/src/ui/android/res/layout/activity_lexical_entry.xml
+++ b/src/ui/android/res/layout/activity_lexical_entry.xml
@@ -1,48 +1,63 @@
-
+
-
-
+
+
-
+ android:layout_alignParentRight="true"
+ android:padding="8dp"
+ android:background="#C0C0C0">
+
+
+
+
+
+
+
+
+
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
\ No newline at end of file
diff --git a/src/ui/android/res/layout/activity_main.xml b/src/ui/android/res/layout/activity_main.xml
index de7e297aa..b77fe5857 100644
--- a/src/ui/android/res/layout/activity_main.xml
+++ b/src/ui/android/res/layout/activity_main.xml
@@ -1,83 +1,91 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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 23c3348c2..b7a8e9859 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java
@@ -30,7 +30,8 @@ public class LexicalEntryActivity extends ListActivity {
private Translator mTranslator;
private LanguageSelector mShowLanguageView;
-
+ private View mProgressBarView = null;
+
/** Called when the activity is first created. */
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -69,6 +70,8 @@ public class LexicalEntryActivity extends ListActivity {
TextView descrView = (TextView) findViewById(R.id.lexical_desc);
descrView.setText(getIntent().getExtras().getString("source"));
+ mProgressBarView = findViewById(R.id.progressBarView);
+
updateTranslations();
}
@@ -79,33 +82,12 @@ public class LexicalEntryActivity extends ListActivity {
mShowLanguageView.setSelectedLanguage(mTranslator.getTargetLanguage());
}
- private View mProgressBar = null;
-
private void showProgressBar() {
- TextView localTextView = (TextView) getWindow().findViewById(
- android.R.id.title);
- if (localTextView != null) {
- ViewParent localViewParent = localTextView.getParent();
- if (localViewParent != null && (localViewParent instanceof FrameLayout)) {
- mProgressBar = ((LayoutInflater) getSystemService("layout_inflater"))
- .inflate(R.layout.progress_bar, null);
- FrameLayout.LayoutParams params =
- new FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT,
- FrameLayout.LayoutParams.WRAP_CONTENT,
- Gravity.RIGHT);
- ((FrameLayout) localViewParent).addView(mProgressBar, params);
- }
- }
+ mProgressBarView.setVisibility(View.VISIBLE);
}
private void hideProgressBar() {
- if (mProgressBar != null) {
- ViewParent localViewParent = mProgressBar.getParent();
-
- if (localViewParent != null && (localViewParent instanceof FrameLayout)) {
- ((FrameLayout) localViewParent).removeView(mProgressBar);
- }
- }
+ mProgressBarView.setVisibility(View.GONE);
}
private View expandedView;
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 51a2b4cdd..f75f82cf4 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java
@@ -52,6 +52,9 @@ public class MainActivity extends Activity {
private boolean input_mode;
private SpeechInputListener mSpeechListener;
+
+ private View mProgressBarView = null;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -63,6 +66,7 @@ public class MainActivity extends Activity {
mSourceLanguageView = (LanguageSelector) findViewById(R.id.source_language);
mTargetLanguageView = (LanguageSelector) findViewById(R.id.target_language);
mSwitchLanguagesButton = (ImageView) findViewById(R.id.switch_languages);
+ mProgressBarView = findViewById(R.id.progressBarView);
mStartStopButton.setOnClickListener(new OnClickListener() {
@Override
@@ -133,33 +137,12 @@ public class MainActivity extends Activity {
mTargetLanguageView.setSelectedLanguage(mTranslator.getTargetLanguage());
}
- private View mProgressBar = null;
-
private void showProgressBar() {
- TextView localTextView = (TextView) getWindow().findViewById(
- android.R.id.title);
- if (localTextView != null) {
- ViewParent localViewParent = localTextView.getParent();
- if (localViewParent != null && (localViewParent instanceof FrameLayout)) {
- mProgressBar = ((LayoutInflater) getSystemService("layout_inflater"))
- .inflate(R.layout.progress_bar, null);
- FrameLayout.LayoutParams params =
- new FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT,
- FrameLayout.LayoutParams.WRAP_CONTENT,
- Gravity.RIGHT);
- ((FrameLayout) localViewParent).addView(mProgressBar, params);
- }
- }
+ mProgressBarView.setVisibility(View.VISIBLE);
}
private void hideProgressBar() {
- if (mProgressBar != null) {
- ViewParent localViewParent = mProgressBar.getParent();
-
- if (localViewParent != null && (localViewParent instanceof FrameLayout)) {
- ((FrameLayout) localViewParent).removeView(mProgressBar);
- }
- }
+ mProgressBarView.setVisibility(View.GONE);
}
@Override