the Android UI uses a new progress indicator which works on both Nexus 1 and Nexus 7

4 files changed, 155 insertions, 167 deletions

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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        >
+<FrameLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_height="match_parent"
+	android:layout_width="match_parent">
 
 	<RelativeLayout
-		android:id="@+id/lexical_header"
-		android:layout_height="wrap_content"
-		android:layout_width="match_parent"
-		android:layout_alignParentTop="true"
-		android:layout_alignParentLeft="true"
-		android:layout_alignParentRight="true"
-		android:padding="8dp"
-		android:background="#C0C0C0"
-		>
-    
-		<org.grammaticalframework.ui.android.LanguageSelector
-			android:id="@+id/show_language"
+		android:layout_height="match_parent"
+		android:layout_width="match_parent">
+
+		<RelativeLayout
+			android:id="@+id/lexical_header"
 			android:layout_height="wrap_content"
 			android:layout_width="match_parent"
+			android:layout_alignParentTop="true"
 			android:layout_alignParentLeft="true"
-	        android:layout_alignParentTop="true"
-			android:padding="0dp"
-			/>
-		
-	</RelativeLayout>
+			android:layout_alignParentRight="true"
+			android:padding="8dp"
+			android:background="#C0C0C0">
+
+			<org.grammaticalframework.ui.android.LanguageSelector
+				android:id="@+id/show_language"
+				android:layout_height="wrap_content"
+				android:layout_width="match_parent"
+				android:layout_alignParentLeft="true"
+				android:layout_alignParentTop="true"
+				android:padding="0dp"/>
 
-	<TextView
-       	android:id="@+id/lexical_desc"
-       	android:layout_width="fill_parent"
-       	android:layout_height="wrap_content"
-       	android:layout_below="@+id/lexical_header"
-       	android:paddingLeft="1dp"
-       	android:paddingTop="4dp"
-       	android:paddingBottom="2dp"
-       	android:textSize="25sp"/>
+		</RelativeLayout>
 	
-	<ListView
-    	android:layout_width="match_parent"
-    	android:layout_height="match_parent"
-    	android:layout_below="@id/lexical_desc"
-    	android:orientation="vertical"
-    	android:paddingLeft="1dp"
-    	android:id="@android:id/list" >
-	</ListView>
-</RelativeLayout>
\ No newline at end of file
+		<TextView
+			android:id="@+id/lexical_desc"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_below="@+id/lexical_header"
+			android:paddingLeft="1dp"
+			android:paddingTop="4dp"
+			android:paddingBottom="2dp"
+			android:textSize="25sp"/>
+
+		<ListView
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:layout_below="@id/lexical_desc"
+			android:orientation="vertical"
+			android:paddingLeft="1dp"
+			android:id="@android:id/list" >
+		</ListView>
+	</RelativeLayout>
+
+	<LinearLayout
+		android:id="@+id/progressBarView" 
+		android:gravity="center"
+		android:visibility="gone"
+		android:background="#00000000"
+		android:layout_height="match_parent"
+		android:layout_width="match_parent">
+
+		<ProgressBar
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"/>	
+	</LinearLayout>
+</FrameLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        >
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent">
 
     <RelativeLayout
-            android:id="@+id/top_bg"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentRight="true"
-            android:padding="8dp"
-            android:background="#C0C0C0"
-            >
-
-        <ImageView
-                android:id="@+id/start_stop"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_alignTop="@+id/source_language"
-                android:layout_alignBottom="@+id/target_language"
-                android:layout_alignParentRight="true"
-                android:padding="8dp"
-                android:src="@drawable/ic_mic"
-                android:contentDescription="@string/microphone"
-                />
-
-        <ImageView
-                android:id="@+id/switch_languages"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_alignTop="@+id/source_language"
-                android:layout_alignBottom="@+id/target_language"
-                android:layout_toLeftOf="@id/start_stop"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_switch"
-                android:contentDescription="@string/switch_languages"
-                />
-
-        <org.grammaticalframework.ui.android.LanguageSelector
-                android:id="@+id/source_language"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentTop="true"
-                android:layout_toLeftOf="@id/switch_languages"
-                android:padding="0dp"
-                />
-
-        <org.grammaticalframework.ui.android.LanguageSelector
-                android:id="@+id/target_language"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:layout_below="@id/source_language"
-                android:layout_toLeftOf="@id/switch_languages"
-                android:padding="0dp"
-                />
-
-    </RelativeLayout>
-
-    <org.grammaticalframework.ui.android.ConversationView
-            android:id="@+id/conversation"
-            android:layout_height="match_parent"
-            android:layout_width="match_parent"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentRight="true"
-            android:layout_below="@id/top_bg"
-            >
-        <LinearLayout
-                android:id="@+id/conversation_content"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:orientation="vertical"
-                android:padding="16dp"
-                >
-        </LinearLayout>
-    </org.grammaticalframework.ui.android.ConversationView>
-
-</RelativeLayout>
\ No newline at end of file
+		android:layout_height="match_parent"
+		android:layout_width="match_parent">
+	
+	    <RelativeLayout
+	       	android:id="@+id/top_bg"
+			android:layout_height="wrap_content"
+			android:layout_width="match_parent"
+			android:layout_alignParentTop="true"
+			android:layout_alignParentLeft="true"
+			android:layout_alignParentRight="true"
+			android:padding="8dp"
+			android:background="#C0C0C0">
+	
+	        <ImageView
+				android:id="@+id/start_stop"
+				android:layout_height="wrap_content"
+				android:layout_width="wrap_content"
+				android:layout_alignTop="@+id/source_language"
+				android:layout_alignBottom="@+id/target_language"
+				android:layout_alignParentRight="true"
+				android:padding="8dp"
+				android:src="@drawable/ic_mic"
+				android:contentDescription="@string/microphone"/>
+	
+	        <ImageView
+				android:id="@+id/switch_languages"
+				android:layout_height="wrap_content"
+				android:layout_width="wrap_content"
+				android:layout_alignTop="@+id/source_language"
+				android:layout_alignBottom="@+id/target_language"
+				android:layout_toLeftOf="@id/start_stop"
+				android:padding="8dp"
+				android:src="@drawable/ic_action_switch"
+				android:contentDescription="@string/switch_languages"/>
+	
+			<org.grammaticalframework.ui.android.LanguageSelector
+				android:id="@+id/source_language"
+				android:layout_height="wrap_content"
+				android:layout_width="match_parent"
+				android:layout_alignParentLeft="true"
+				android:layout_alignParentTop="true"
+				android:layout_toLeftOf="@id/switch_languages"
+				android:padding="0dp"/>
+	
+			<org.grammaticalframework.ui.android.LanguageSelector
+				android:id="@+id/target_language"
+				android:layout_height="wrap_content"
+				android:layout_width="match_parent"
+				android:layout_below="@id/source_language"
+				android:layout_toLeftOf="@id/switch_languages"
+				android:padding="0dp"/>
+		</RelativeLayout>
+	
+		<org.grammaticalframework.ui.android.ConversationView
+			android:id="@+id/conversation"
+			android:layout_height="match_parent"
+			android:layout_width="match_parent"
+			android:layout_alignParentLeft="true"
+			android:layout_alignParentBottom="true"
+			android:layout_alignParentRight="true"
+			android:layout_below="@id/top_bg">
+			
+			<LinearLayout
+				android:id="@+id/conversation_content"
+				android:layout_height="wrap_content"
+				android:layout_width="match_parent"
+				android:orientation="vertical"
+				android:padding="16dp"/>
+		</org.grammaticalframework.ui.android.ConversationView>
+	</RelativeLayout>
+	
+	<LinearLayout
+		android:id="@+id/progressBarView" 
+		android:gravity="center"
+		android:visibility="gone"
+		android:background="#00000000"
+		android:layout_height="match_parent"
+		android:layout_width="match_parent">
+		
+		<ProgressBar
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"/>	
+	</LinearLayout>
+</FrameLayout>
\ 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