bugfix in the android keyboard for the choice of language

2 files changed, 15 insertions, 6 deletions

diff --git a/src/ui/android/res/layout/keyboard_languages_options.xml b/src/ui/android/res/layout/keyboard_languages_options.xml
index 0b45b739c..17512df19 100644
--- a/src/ui/android/res/layout/keyboard_languages_options.xml
+++ b/src/ui/android/res/layout/keyboard_languages_options.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<TableLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -17,4 +17,4 @@
         android:padding="5dp"
         android:clickable="true"
         />
-</LinearLayout>
\ No newline at end of file
+</TableLayout>
\ No newline at end of file
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 922e1774d..943c48d35 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboardView.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboardView.java
@@ -10,8 +10,9 @@ import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
-import android.widget.LinearLayout;
 import android.widget.PopupWindow;
+import android.widget.TableLayout;
+import android.widget.TableRow;
 
 public class TranslatorKeyboardView extends KeyboardView {
 
@@ -34,18 +35,26 @@ public class TranslatorKeyboardView extends KeyboardView {
     	if (mLanguagesPopup == null) {
 	    	LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(
 	                Context.LAYOUT_INFLATER_SERVICE);
-	    	LinearLayout popupContainer = (LinearLayout)
+	    	TableLayout popupContainer = (TableLayout)
 	    		inflater.inflate(R.layout.keyboard_languages_options, null);
 	
 	    	int index = 0;
+	    	TableRow row = null;
 	    	for (Language lang : mTranslator.getAvailableLanguages()) {
+	    		int col_index = index % 4;
+	    		if (col_index == 0) {
+	    			row = new TableRow(getContext());
+	    			popupContainer.addView(row);
+	    		}
+
 	    		Button item = new Button(getContext());
 	    		item.setText(TranslatorKeyboard.getLanguageKeyLabel(lang));
 	    		item.setTag(index);
 	    		item.setOnClickListener(this);
-	    		popupContainer.addView(item, index++);
+	    		row.addView(item, col_index);
+	    		index++;
 	    	}
-	
+
 	    	popupContainer.measure(
 	                MeasureSpec.makeMeasureSpec(getWidth(), MeasureSpec.AT_MOST), 
 	                MeasureSpec.makeMeasureSpec(getHeight(), MeasureSpec.AT_MOST));