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

src/ui/android/res/layout/activity_lexical_entry.xml

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<FrameLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_height="match_parent"
-        android:layout_width="match_parent"
+	android:layout_width="match_parent">
-        >
+
+	<RelativeLayout
+		android:layout_height="match_parent"
+		android:layout_width="match_parent">
 
 		<RelativeLayout
 			android:id="@+id/lexical_header"
@@ -13,8 +16,7 @@
 			android:layout_alignParentLeft="true"
 			android:layout_alignParentRight="true"
 			android:padding="8dp"
-		android:background="#C0C0C0"
+			android:background="#C0C0C0">
-		>
 
 			<org.grammaticalframework.ui.android.LanguageSelector
 				android:id="@+id/show_language"
@@ -22,8 +24,7 @@
 				android:layout_width="match_parent"
 				android:layout_alignParentLeft="true"
 				android:layout_alignParentTop="true"
-			android:padding="0dp"
+				android:padding="0dp"/>
-			/>
 
 		</RelativeLayout>
 	
@@ -46,3 +47,17 @@
 			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>

src/ui/android/res/layout/activity_main.xml

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
-        android:layout_width="match_parent"
+    android:layout_width="match_parent">
-        >
+
+    <RelativeLayout
+		android:layout_height="match_parent"
+		android:layout_width="match_parent">
 	
 	    <RelativeLayout
 	       	android:id="@+id/top_bg"
@@ -13,8 +16,7 @@
 			android:layout_alignParentLeft="true"
 			android:layout_alignParentRight="true"
 			android:padding="8dp"
-            android:background="#C0C0C0"
+			android:background="#C0C0C0">
-            >
 	
 	        <ImageView
 				android:id="@+id/start_stop"
@@ -25,8 +27,7 @@
 				android:layout_alignParentRight="true"
 				android:padding="8dp"
 				android:src="@drawable/ic_mic"
-                android:contentDescription="@string/microphone"
+				android:contentDescription="@string/microphone"/>
-                />
 	
 	        <ImageView
 				android:id="@+id/switch_languages"
@@ -37,8 +38,7 @@
 				android:layout_toLeftOf="@id/start_stop"
 				android:padding="8dp"
 				android:src="@drawable/ic_action_switch"
-                android:contentDescription="@string/switch_languages"
+				android:contentDescription="@string/switch_languages"/>
-                />
 	
 			<org.grammaticalframework.ui.android.LanguageSelector
 				android:id="@+id/source_language"
@@ -47,8 +47,7 @@
 				android:layout_alignParentLeft="true"
 				android:layout_alignParentTop="true"
 				android:layout_toLeftOf="@id/switch_languages"
-                android:padding="0dp"
+				android:padding="0dp"/>
-                />
 	
 			<org.grammaticalframework.ui.android.LanguageSelector
 				android:id="@+id/target_language"
@@ -56,9 +55,7 @@
 				android:layout_width="match_parent"
 				android:layout_below="@id/source_language"
 				android:layout_toLeftOf="@id/switch_languages"
-                android:padding="0dp"
+				android:padding="0dp"/>
-                />
-
 		</RelativeLayout>
 	
 		<org.grammaticalframework.ui.android.ConversationView
@@ -68,16 +65,27 @@
 			android:layout_alignParentLeft="true"
 			android:layout_alignParentBottom="true"
 			android:layout_alignParentRight="true"
-            android:layout_below="@id/top_bg"
+			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"
+				android:padding="16dp"/>
-                >
-        </LinearLayout>
 		</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>

src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java

@@ -30,6 +30,7 @@ public class LexicalEntryActivity extends ListActivity {
 
 	private Translator mTranslator;
 	private LanguageSelector mShowLanguageView;
+	private View mProgressBarView = null;
 	
 	/** Called when the activity is first created. */
 	@Override
@@ -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(
+		mProgressBarView.setVisibility(View.VISIBLE);
-                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);
-            }
-        }
 	}
 	
 	private void hideProgressBar() {
-		if (mProgressBar != null) {
+		mProgressBarView.setVisibility(View.GONE);
-			ViewParent localViewParent = mProgressBar.getParent();
-			
-			if (localViewParent != null && (localViewParent instanceof FrameLayout)) {
-				((FrameLayout) localViewParent).removeView(mProgressBar);
-			}
-		}
 	}
 
 	private View expandedView;

src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java

@@ -53,6 +53,9 @@ public class MainActivity extends Activity {
 
     private SpeechInputListener mSpeechListener;
     
+	private View mProgressBarView = null;
+
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(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(
+		mProgressBarView.setVisibility(View.VISIBLE);
-                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);
-            }
-        }
 	}
 	
 	private void hideProgressBar() {
-		if (mProgressBar != null) {
+		mProgressBarView.setVisibility(View.GONE);
-			ViewParent localViewParent = mProgressBar.getParent();
-			
-			if (localViewParent != null && (localViewParent instanceof FrameLayout)) {
-				((FrameLayout) localViewParent).removeView(mProgressBar);
-			}
-		}
 	}
 
 	@Override