From 06c259faa2bda721dbbf7e7ef4cafde054989ae8 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Fri, 10 Aug 2012 15:28:23 +0200
Subject: [PATCH] Better setup display using mark system

---
 res/drawable-hdpi/setup_mark.png | Bin 0 -> 531 bytes
 res/drawable-mdpi/setup_mark.png | Bin 0 -> 371 bytes
 res/layout/setup.xml             |  40 +++++++++++++++++++++++++++----
 3 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 res/drawable-hdpi/setup_mark.png
 create mode 100644 res/drawable-mdpi/setup_mark.png

diff --git a/res/drawable-hdpi/setup_mark.png b/res/drawable-hdpi/setup_mark.png
new file mode 100644
index 0000000000000000000000000000000000000000..71504e74b682259642ecec32d05fe54ea7a00c10
GIT binary patch
literal 531
zcmeAS@N?(olHy`uVBq!ia0y~yU~~Yo+d0^PWI9)a5RhUl4sv&5Sa(k5C6L3G<n8Xl
z@E-&h>|H(?D8gCb5n0T@z%2~Ij105pNB{-dOFVsD+3#?0@k(l+Y?O-v3Q3l@MwB?`
z=jNv7l`uFLr6!i7rYMwWmSiZnd-?{1H}Z)Ct;+LsaSW-r_4bM(BLf4+;SG)T=NB|}
zyEyfSP2xP@tjn0tz`({qF(IMQz{o@ef?|h&4UkyCGBD0z7yCVriTA>9zk|T&VeoYI
Kb6Mw<&;$Us_iteU

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/setup_mark.png b/res/drawable-mdpi/setup_mark.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d63f854774a84607dec81afe97b0c0e8d7d486c
GIT binary patch
literal 371
zcmeAS@N?(olHy`uVBq!ia0vp^*MK;RgAGU?nYf}CNHG=%xjQkeJ16rJ$YD$Jc6VX;
z4}uH!E}sk(;VkfoEM{Qf76xHPhFNnYfP(BLp1!W^cR09srBsT912}*}k|nMYCC>S|
zxv6<249-QVi6yBi3gww484B*6z5(HleBwYw=R92;Ln>~)y==(Kz`((>k^TR?gDlL>
z+7BnKRuO&>;>~c3DY<bY0}vmGXaM2_9S}AU17Qhn5bj|G;bTl7oXm)%oCKxFCKE6f
hSt+t3Ko0n?>-mszbH^0DW}wd)JYD@<);T3K0RTZ<ZeIWZ

literal 0
HcmV?d00001

diff --git a/res/layout/setup.xml b/res/layout/setup.xml
index 6db471a82..06e11bd44 100644
--- a/res/layout/setup.xml
+++ b/res/layout/setup.xml
@@ -4,18 +4,45 @@
   	android:background="@drawable/background"
 	android:layout_height="match_parent">
      
+    <LinearLayout
+		android:id="@+id/mark"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_alignParentBottom="true"
+		android:orientation="horizontal">
+	    
+		<ImageView 
+			android:visibility="invisible"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:src="@drawable/setup_mark"
+			android:adjustViewBounds="true"
+			android:scaleType="fitXY"
+			android:layout_weight="0.5"/>
+		          
+		<ImageView 
+			android:visibility="invisible"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:src="@drawable/setup_mark"
+			android:adjustViewBounds="true"
+			android:scaleType="fitXY"
+			android:layout_weight="0.5"/>
+	  
+	</LinearLayout>
+	
 	<LinearLayout
 		android:id="@+id/fragmentContainer"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:paddingBottom="75dp"
 		android:padding="20dp"
+		android:layout_above="@id/mark"
 		android:orientation="horizontal" />
 	  
 	<LinearLayout
 		android:id="@+id/menu"
 		android:layout_width="match_parent"
-		android:layout_height="90dp"
+		android:layout_height="wrap_content"
 		android:layout_alignParentBottom="true"
 		android:orientation="horizontal">
 	    
@@ -23,8 +50,9 @@
 			android:contentDescription="@string/content_description_cancel"
 			android:id="@+id/setup_cancel"
 			android:layout_width="match_parent"
-			android:layout_height="match_parent"
+			android:layout_height="wrap_content"
 			android:src="@drawable/setup_cancel"
+			android:adjustViewBounds="true"
 			android:scaleType="fitXY"
 			android:layout_weight="0.5"/>
 		          
@@ -32,8 +60,9 @@
 			android:contentDescription="@string/content_description_next"
 			android:id="@+id/setup_next"
 			android:layout_width="match_parent"
-			android:layout_height="match_parent"
+			android:layout_height="wrap_content"
 			android:src="@drawable/setup_next"
+			android:adjustViewBounds="true"
 			android:scaleType="fitXY"
 			android:layout_weight="0.5"/>
 		         
@@ -42,8 +71,9 @@
 			android:id="@+id/setup_back"
 			android:visibility="gone"
 			android:layout_width="match_parent"
-			android:layout_height="match_parent"
+			android:layout_height="wrap_content"
 			android:src="@drawable/setup_back"
+			android:adjustViewBounds="true"
 			android:scaleType="fitXY"
 			android:layout_weight="0.5"/>