Mercurial Mercurial > beem > otr / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
authormarseille
Fri, 24 Apr 2009 13:26:52 +0200
changeset 175 0e59b0a9509b
parent 174 f106a71a4cf6 (current diff)
parent 172 471893ecd402 (diff)
child 177 779ac7aefd71
merge
src/com/beem/project/beem/ui/ContactList.java file | annotate | diff | comparison | revisions 
--- a/res/layout/contactlistcontact.xml	Fri Apr 24 13:26:01 2009 +0200
+++ b/res/layout/contactlistcontact.xml	Fri Apr 24 13:26:52 2009 +0200
@@ -5,7 +5,6 @@
         android:layout_height="wrap_content"
         android:paddingLeft="10px"
         android:paddingRight="10px"
-        android:background="@drawable/beem_sendim_header_1"
         android:gravity="center_vertical" >
 
         <ImageView android:id="@+id/contactliststatus"
--- a/res/layout/contactlistgroup.xml	Fri Apr 24 13:26:01 2009 +0200
+++ b/res/layout/contactlistgroup.xml	Fri Apr 24 13:26:52 2009 +0200
@@ -4,7 +4,6 @@
         android:layout_width="fill_parent"
         android:layout_height="50sp"
 		android:paddingTop="5sp"
-		android:background="@drawable/beem_contactlist_header_1"
 		android:gravity="center_vertical">
 
         <TextView android:id="@+id/textgroup"
--- a/res/layout/sendim.xml	Fri Apr 24 13:26:01 2009 +0200
+++ b/res/layout/sendim.xml	Fri Apr 24 13:26:52 2009 +0200
@@ -7,7 +7,6 @@
         android:orientation="horizontal"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/beem_sendim_header_1"
         android:gravity="center_vertical" >
 
         <ImageView
--- a/src/com/beem/project/beem/ui/ContactList.java	Fri Apr 24 13:26:01 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java	Fri Apr 24 13:26:52 2009 +0200
@@ -66,11 +66,11 @@
 	mSettings = getSharedPreferences(getString(R.string.PreferenceFileName), MODE_PRIVATE);
 	mBeemApplication = BeemApplication.getApplication(this);
 	// bug fixe temporaire des betises de marseille
-	/*
-	 * SharedPreferences mSettings = getSharedPreferences(getString(R.string.PreferenceFileName), MODE_PRIVATE);
-	 * SharedPreferences.Editor editor = mSettings.edit(); editor.putInt(getString(R.string.PreferencePortKey),
-	 * 5222); editor.commit();
-	 */
+//	
+//	 SharedPreferences mSettings = getSharedPreferences(getString(R.string.PreferenceFileName), MODE_PRIVATE);
+//	 SharedPreferences.Editor editor = mSettings.edit(); editor.putInt(getString(R.string.PreferencePortKey),
+//	 5222); editor.commit();
+	 
     }
 
     @Override
BEEM-OTR