From ff67b26934d4d3721fdc022c324071678014f6d8 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Mon, 10 Sep 2012 13:02:37 +0200
Subject: [PATCH] Fix settings tablets

---
 res/layout-xlarge-land/settings.xml | 185 ++--------------------------
 1 file changed, 9 insertions(+), 176 deletions(-)

diff --git a/res/layout-xlarge-land/settings.xml b/res/layout-xlarge-land/settings.xml
index 4fe6a4422..4d86777a0 100644
--- a/res/layout-xlarge-land/settings.xml
+++ b/res/layout-xlarge-land/settings.xml
@@ -1,182 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/topLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-       
-    <!-- Hack to adjust perfectly on every screen the bottom of the fragment with the curved menu -->
-    <LinearLayout
-	    android:id="@+id/mark"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:orientation="horizontal">
+
+    <ListView
+	    android:id="@+id/list"
+	    android:layout_width="match_parent" 
+	    android:layout_height="match_parent"
+	    android:drawSelectorOnTop="false"
+	    android:cacheColorHint="@color/transparent"
+	    android:scrollbarAlwaysDrawVerticalTrack="true" />
     
-		<ImageView
-		    android:layout_width="match_parent"
-		    android:layout_height="wrap_content"
-		    android:layout_weight="0.2"
-		    android:adjustViewBounds="true"
-		    android:scaleType="fitXY"
-		    android:src="@drawable/mark"
-		    android:visibility="invisible" />
-		
-		<ImageView
-		    android:layout_width="match_parent"
-		    android:layout_height="wrap_content"
-		    android:layout_weight="0.2"
-		    android:adjustViewBounds="true"
-		    android:scaleType="fitXY"
-		    android:src="@drawable/mark"
-		    android:visibility="invisible" />
-		
-		<ImageView
-		    android:layout_width="match_parent"
-		    android:layout_height="wrap_content"
-		    android:layout_weight="0.25"
-		    android:adjustViewBounds="true"
-		    android:scaleType="fitEnd"
-		    android:src="@drawable/dialer"
-		    android:visibility="invisible" />
-		
-		<ImageView
-		    android:layout_width="match_parent"
-		    android:layout_height="wrap_content"
-		    android:layout_weight="0.2"
-		    android:adjustViewBounds="true"
-		    android:scaleType="fitXY"
-		    android:src="@drawable/mark"
-		    android:visibility="invisible" />
-		
-		<ImageView
-		    android:layout_width="match_parent"
-		    android:layout_height="wrap_content"
-		    android:layout_weight="0.2"
-		    android:adjustViewBounds="true"
-		    android:scaleType="fitXY"
-		    android:src="@drawable/mark"
-		    android:visibility="invisible" />
-        
-    </LinearLayout>
-		
-	<ListView
-	    android:id="@android:id/list"
-        android:listSelector="@drawable/list_selector" 
-        android:cacheColorHint="@color/transparent"
-        android:layout_above="@id/mark"
-	    android:layout_width="match_parent"
-	    android:layout_height="match_parent" />
-    
-	<LinearLayout
-        android:id="@+id/menu"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:orientation="horizontal" >
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.2" >
-
-            <ImageView
-                android:id="@+id/history"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-				android:adjustViewBounds="true"
-                android:contentDescription="@string/content_description_history"
-                android:scaleType="fitXY"
-                android:src="@drawable/history" />
-
-            <TextView
-                android:id="@+id/missedCalls"
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentTop="true"
-                android:background="@drawable/missed_calls_bg"
-                android:gravity="center"
-                android:textSize="20dp"
-                android:visibility="gone" />
-        </RelativeLayout>
-
-        <ImageView
-            android:id="@+id/contacts"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.2"
-			android:adjustViewBounds="true"
-            android:contentDescription="@string/content_description_contacts"
-            android:scaleType="fitXY"
-            android:src="@drawable/contacts" />
-
-        <ImageView
-            android:id="@+id/dialer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.25"
-			android:adjustViewBounds="true"
-            android:contentDescription="@string/content_description_dialer"
-            android:scaleType="fitEnd"
-            android:src="@drawable/dialer" />
-
-        <ImageView
-            android:id="@+id/settings"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.2"
-			android:adjustViewBounds="true"
-            android:contentDescription="@string/content_description_settings"
-            android:scaleType="fitXY"
-            android:src="@drawable/settings" />
-        
-        <ImageView
-            android:id="@+id/about_settings"
-            android:visibility="gone"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.2"
-			android:adjustViewBounds="true"
-            android:contentDescription="@string/content_description_about"
-            android:scaleType="fitXY"
-            android:src="@drawable/about_settings" />
-        
-        <ImageView
-            android:id="@+id/about_chat"
-            android:visibility="gone"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.2"
-			android:adjustViewBounds="true"
-            android:contentDescription="@string/content_description_about"
-            android:scaleType="fitXY"
-            android:src="@drawable/about_chat" />
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.2" >
-
-            <ImageView
-                android:id="@+id/chat"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-				android:adjustViewBounds="true"
-                android:contentDescription="@string/content_description_chat"
-                android:scaleType="fitXY"
-                android:src="@drawable/chat" />
-
-            <TextView
-                android:id="@+id/missedChats"
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentTop="true"
-                android:background="@drawable/missed_calls_bg"
-                android:gravity="center"
-                android:textSize="20dp"
-                android:visibility="gone" />
-        </RelativeLayout>
-        
-    </LinearLayout>
-
 </RelativeLayout>
\ No newline at end of file