Improved menu text buttons + translatable buttons for assistant

res/drawable/text_color_setup_next.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <selector xmlns:android="http://schemas.android.com/apk/res/android">
+     <item android:state_pressed="true"
+           android:color="@color/text_over" />
+     <item android:state_enabled="false"
+           android:color="@color/text_default" /> 
+     <item android:color="@color/text_selected" />
+ </selector>

res/layout/menu_about_chat_button.xml

@@ -22,7 +22,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_alignBottom="@id/image"
-        android:paddingBottom="5dp"
+        android:paddingBottom="10dp"
         android:textColor="@drawable/text_color"
         android:text="@string/button_about" />
     

res/layout/menu_about_settings_button.xml

@@ -22,7 +22,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_alignBottom="@id/image"
-        android:paddingBottom="5dp"
+        android:paddingBottom="10dp"
         android:textColor="@drawable/text_color"
         android:text="@string/button_about" />
     

res/layout/menu_chat_button.xml

@@ -20,7 +20,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_alignBottom="@id/image"
-        android:paddingBottom="5dp"
+        android:paddingBottom="10dp"
         android:textColor="@drawable/text_color"
         android:text="@string/button_chat" />
     

res/layout/menu_contact_button.xml

@@ -21,7 +21,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_alignBottom="@id/image"
-        android:paddingBottom="5dp"
+        android:paddingBottom="10dp"
         android:textColor="@drawable/text_color"
         android:text="@string/button_contacts" />
     

res/layout/menu_history_button.xml

@@ -20,7 +20,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_alignBottom="@id/image"
-        android:paddingBottom="5dp"
+        android:paddingBottom="10dp"
         android:textColor="@drawable/text_color"
         android:text="@string/button_history" />
     

res/layout/menu_settings_button.xml

@@ -21,7 +21,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_alignBottom="@id/image"
-        android:paddingBottom="5dp"
+        android:paddingBottom="10dp"
         android:textColor="@drawable/text_color"
         android:text="@string/button_settings" />
     

res/layout/setup.xml

@@ -46,36 +46,11 @@
 		android:layout_alignParentBottom="true"
 		android:orientation="horizontal">
 	    
-		<ImageView 
+		<include layout="@layout/setup_cancel_button" />
-			android:contentDescription="@string/content_description_cancel"
-			android:id="@+id/setup_cancel"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:src="@drawable/setup_cancel"
-			android:adjustViewBounds="true"
-			android:scaleType="fitXY"
-			android:layout_weight="0.5"/>
 		          
-		<ImageView 
+		<include layout="@layout/setup_next_button" />
-			android:contentDescription="@string/content_description_next"
+		
-			android:id="@+id/setup_next"
+		<include layout="@layout/setup_back_button" />    
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:src="@drawable/setup_next"
-			android:adjustViewBounds="true"
-			android:scaleType="fitXY"
-			android:layout_weight="0.5"/>
-		         
-		<ImageView 
-			android:contentDescription="@string/content_description_back"
-			android:id="@+id/setup_back"
-			android:visibility="gone"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:src="@drawable/setup_back"
-			android:adjustViewBounds="true"
-			android:scaleType="fitXY"
-			android:layout_weight="0.5"/>
 	  
 	</LinearLayout>
  

res/layout/setup_back_button.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/setup_back"
+	android:visibility="gone"
+	android:layout_weight="0.5"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+    
+    <ImageView 
+        android:id="@+id/image"
+		android:contentDescription="@string/content_description_back"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:src="@drawable/setup_back"
+		android:adjustViewBounds="true"
+		android:scaleType="fitXY" />
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_alignBottom="@id/image"
+        android:paddingBottom="10dp"
+        android:textColor="@drawable/text_color"
+        android:text="@string/button_setup_back" />
+    
+</RelativeLayout>

res/layout/setup_cancel_button.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/setup_cancel"
+	android:layout_weight="0.5"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+    
+    <ImageView 
+        android:id="@+id/image"
+		android:contentDescription="@string/content_description_cancel"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:src="@drawable/setup_cancel"
+		android:adjustViewBounds="true"
+		android:scaleType="fitXY"/>
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_alignBottom="@id/image"
+        android:paddingBottom="10dp"
+        android:textColor="@drawable/text_color"
+        android:text="@string/button_setup_cancel" />
+    
+</RelativeLayout>

res/layout/setup_next_button.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/setup_next"
+	android:layout_weight="0.5"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+    
+    <ImageView 
+        android:id="@+id/image"
+		android:contentDescription="@string/content_description_next"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:src="@drawable/setup_next"
+		android:adjustViewBounds="true"
+		android:scaleType="fitXY" />
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_alignBottom="@id/image"
+        android:paddingBottom="10dp"
+        android:textColor="@drawable/text_color_setup_next"
+        android:text="@string/button_setup_next" />
+    
+</RelativeLayout>

res/values/strings.xml

@@ -325,4 +325,8 @@
 	<string name="button_chat">Chat</string>
 	<string name="button_about">About</string>
 	
+	<string name="button_setup_cancel">Cancel</string>
+	<string name="button_setup_back">Back</string>
+	<string name="button_setup_next">Let\'s go</string>
+	
 </resources>

src/org/linphone/setup/SetupActivity.java

@@ -32,14 +32,14 @@ import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.ImageView;
+import android.widget.RelativeLayout;
 import android.widget.Toast;
 /**
  * @author Sylvain Berfini
  */
 public class SetupActivity extends FragmentActivity implements OnClickListener {
 	private static SetupActivity instance;
-	private ImageView back, next, cancel;
+	private RelativeLayout back, next, cancel;
 	private SetupFragments currentFragment;
 	private SharedPreferences mPref;
 	
@@ -69,11 +69,11 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
 	}
 	
 	private void initUI() {
-		back = (ImageView) findViewById(R.id.setup_back);
+		back = (RelativeLayout) findViewById(R.id.setup_back);
 		back.setOnClickListener(this);
-		next = (ImageView) findViewById(R.id.setup_next);
+		next = (RelativeLayout) findViewById(R.id.setup_next);
 		next.setOnClickListener(this);
-		cancel = (ImageView) findViewById(R.id.setup_cancel);
+		cancel = (RelativeLayout) findViewById(R.id.setup_cancel);
 		cancel.setOnClickListener(this);
 	}