From cdbd2b4d65eb7ff03f2a726abc630e97c833724a Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Fri, 10 Aug 2012 16:03:21 +0200
Subject: [PATCH] Fix some issues

---
 res/drawable/list_selector.xml                    | 3 ++-
 res/layout/chatlist.xml                           | 1 -
 res/layout/chatlist_cell.xml                      | 1 +
 res/layout/contact_cell.xml                       | 1 +
 res/layout/contacts_list.xml                      | 1 -
 res/layout/history.xml                            | 1 -
 res/layout/history_cell.xml                       | 1 +
 src/org/linphone/compatibility/Compatibility.java | 4 ++--
 8 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/res/drawable/list_selector.xml b/res/drawable/list_selector.xml
index 6d70448b8..1cfc68647 100644
--- a/res/drawable/list_selector.xml
+++ b/res/drawable/list_selector.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
+    <item 
+    	android:state_pressed="true" 
         android:drawable="@color/main_app_color" />
     <item
          android:drawable="@color/transparent" />
diff --git a/res/layout/chatlist.xml b/res/layout/chatlist.xml
index c671c3a91..103f35762 100644
--- a/res/layout/chatlist.xml
+++ b/res/layout/chatlist.xml
@@ -45,7 +45,6 @@
     
     <ListView 
         android:id="@+id/chatList"
-        android:listSelector="@drawable/list_selector" 
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:divider="@android:color/darker_gray"
diff --git a/res/layout/chatlist_cell.xml b/res/layout/chatlist_cell.xml
index 2d56249ed..9faff3c10 100644
--- a/res/layout/chatlist_cell.xml
+++ b/res/layout/chatlist_cell.xml
@@ -5,6 +5,7 @@
     android:gravity="center_vertical"
     android:paddingTop="10dp"
     android:paddingBottom="10dp"
+    android:background="@drawable/list_selector"
     android:orientation="horizontal" >
     
 	<TextView 
diff --git a/res/layout/contact_cell.xml b/res/layout/contact_cell.xml
index c9dfa97ab..da10e4f65 100644
--- a/res/layout/contact_cell.xml
+++ b/res/layout/contact_cell.xml
@@ -5,6 +5,7 @@
     android:layout_height="match_parent"
     android:gravity="center_vertical"
     android:paddingBottom="10dp"
+    android:background="@drawable/list_selector"
     android:orientation="vertical" >
     
     <TextView
diff --git a/res/layout/contacts_list.xml b/res/layout/contacts_list.xml
index b916fed57..1495c7b85 100644
--- a/res/layout/contacts_list.xml
+++ b/res/layout/contacts_list.xml
@@ -48,7 +48,6 @@
         
 	    <ListView 
 	        android:id="@+id/contactsList"
-        	android:listSelector="@drawable/list_selector" 
 	        android:layout_width="match_parent"
 	        android:layout_height="match_parent"
 	        android:divider="@android:color/darker_gray"
diff --git a/res/layout/history.xml b/res/layout/history.xml
index b665fdacc..a1bec5a52 100644
--- a/res/layout/history.xml
+++ b/res/layout/history.xml
@@ -55,7 +55,6 @@
     
     <ExpandableListView 
         android:id="@+id/historyList"
-        android:listSelector="@drawable/list_selector" 
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:divider="@android:color/darker_gray"
diff --git a/res/layout/history_cell.xml b/res/layout/history_cell.xml
index e3e09a631..e3d41b7a6 100644
--- a/res/layout/history_cell.xml
+++ b/res/layout/history_cell.xml
@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
+    android:background="@drawable/list_selector"
     android:orientation="horizontal" >
     
     <ImageView 
diff --git a/src/org/linphone/compatibility/Compatibility.java b/src/org/linphone/compatibility/Compatibility.java
index 55bc559b0..55e2af8ca 100644
--- a/src/org/linphone/compatibility/Compatibility.java
+++ b/src/org/linphone/compatibility/Compatibility.java
@@ -188,7 +188,7 @@ public class Compatibility {
 	}
 	
 	public static void setPreferenceChecked(Preference preference, boolean checked) {
-		if (Version.sdkAboveOrEqual(8)) {
+		if (Version.sdkAboveOrEqual(14)) {
 			ApiFourteenPlus.setPreferenceChecked(preference, checked);
 		} else {
 			ApiFivePlus.setPreferenceChecked(preference, checked);
@@ -196,7 +196,7 @@ public class Compatibility {
 	}
 	
 	public static boolean isPreferenceChecked(Preference preference) {
-		if (Version.sdkAboveOrEqual(8)) {
+		if (Version.sdkAboveOrEqual(14)) {
 			return ApiFourteenPlus.isPreferenceChecked(preference);
 		} else {
 			return ApiFivePlus.isPreferenceChecked(preference);