# HG changeset patch
# User Vincent V. <marseille@beem-project.com>
# Date 1342446235 -7200
# Node ID 7caab0161cf9404f200561f86bb037885ba92dfd
# Parent  89f1be755b8d198176880431ad2ef451c5d9c3c9
Android lint parser correction

diff -r 89f1be755b8d -r 7caab0161cf9 AndroidManifest.xml
--- a/AndroidManifest.xml	Mon Jul 16 11:43:10 2012 +0200
+++ b/AndroidManifest.xml	Mon Jul 16 15:43:55 2012 +0200
@@ -4,6 +4,35 @@
     android:versionCode="-1"
     android:versionName="0.2.0" >
 
+    <permission
+        android:name="com.beem.project.beem.BEEM_SERVICE"
+        android:description="@string/BeemServiceDescription"
+        android:label="BeemService"
+        android:permissionGroup="android.permission-group.NETWORK" />
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="com.beem.project.beem.BEEM_SERVICE" />
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
+    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+
+    <uses-sdk
+        android:minSdkVersion="7"
+        android:targetSdkVersion="8" />
+
+    <supports-screens
+        android:anyDensity="true"
+        android:largeScreens="true"
+        android:normalScreens="true"
+        android:smallScreens="true" />
+
     <application
         android:name=".BeemApplication"
         android:icon="@drawable/beem_launcher_icon_silver"
@@ -32,6 +61,7 @@
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.Settings"
+            android:exported="false"
             android:label="@string/edit_settings_name" >
             <intent-filter android:label="Beem Android Account" >
                 <action android:name="com.beem.project.beem.SETTINGS" />
@@ -44,6 +74,7 @@
         </activity>
         <activity
             android:name=".ui.Chat"
+            android:exported="false"
             android:label="@string/chat_name"
             android:launchMode="singleTop" >
             <intent-filter android:label="Beem Connection" >
@@ -69,6 +100,7 @@
         </activity>
         <activity
             android:name=".ui.MucChat"
+            android:exported="false"
             android:label="@string/chat_name"
             android:launchMode="singleTop" >
             <intent-filter android:label="Beem Connection" >
@@ -77,6 +109,7 @@
         </activity>
         <activity
             android:name=".ui.ChangeStatus"
+            android:exported="false"
             android:label="@string/ChangeStatusActTitle"
             android:launchMode="singleTask"
             android:windowSoftInputMode="stateHidden" >
@@ -91,6 +124,7 @@
         </activity>
         <activity
             android:name=".ui.AddContact"
+            android:exported="false"
             android:label="@string/AddCActTitle" >
             <intent-filter android:label="Create Contact" >
                 <action android:name="android.intent.action.INSERT" />
@@ -108,6 +142,7 @@
         </activity>
         <activity
             android:name=".ui.Subscription"
+            android:exported="false"
             android:label="@string/app_name" >
             <intent-filter android:label="Beem Connection" >
                 <action android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
@@ -118,6 +153,7 @@
             android:label="@string/create_account_name" />
         <activity
             android:name=".ui.ContactList"
+            android:exported="false"
             android:label="@string/contact_list_name"
             android:launchMode="singleTask" >
             <intent-filter android:label="Beem Connection" >
@@ -126,6 +162,7 @@
         </activity>
         <activity
             android:name=".ui.GroupList"
+            android:exported="false"
             android:label="GroupList" >
             <intent-filter android:label="Beem Connection" >
                 <action android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
@@ -133,6 +170,7 @@
         </activity>
         <activity
             android:name=".ui.PrivacyList"
+            android:exported="false"
             android:label="@string/privacy_list_name" >
             <intent-filter android:label="Beem Connection" >
                 <action android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
@@ -157,15 +195,17 @@
         <provider
             android:name=".providers.MessageProvider"
             android:authorities="com.beem.project.beem.providers.messageprovider"
+            android:exported="false"
             android:label="Message Provider" />
         <provider
             android:name=".providers.MUCsProvider"
             android:authorities="com.beem.project.beem.providers.mucsprovider"
+            android:exported="false"
             android:label="MUCs Provider" />
 
         <service
             android:name=".account.AuthenticatorService"
-            android:exported="true"
+            android:exported="false"
             android:process=":auth" >
             <intent-filter>
                 <action android:name="android.accounts.AccountAuthenticator" />
@@ -177,7 +217,7 @@
         </service>
         <service
             android:name=".account.SyncAdapterService"
-            android:exported="true"
+            android:exported="false"
             android:process=":contacts" >
             <intent-filter>
                 <action android:name="android.content.SyncAdapter" />
@@ -211,33 +251,4 @@
         </service>
     </application>
 
-    <permission
-        android:name="com.beem.project.beem.BEEM_SERVICE"
-        android:description="@string/BeemServiceDescription"
-        android:label="BeemService"
-        android:permissionGroup="android.permission-group.NETWORK" />
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="com.beem.project.beem.BEEM_SERVICE" />
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
-
-    <uses-sdk
-        android:minSdkVersion="7"
-        android:targetSdkVersion="8" />
-
-    <supports-screens
-        android:anyDensity="true"
-        android:largeScreens="true"
-        android:normalScreens="true"
-        android:smallScreens="true" />
-
 </manifest>
\ No newline at end of file
diff -r 89f1be755b8d -r 7caab0161cf9 res/drawable/button_indicator_prev.png
Binary file res/drawable/button_indicator_prev.png has changed
diff -r 89f1be755b8d -r 7caab0161cf9 res/drawable/icon.png
Binary file res/drawable/icon.png has changed
diff -r 89f1be755b8d -r 7caab0161cf9 res/drawable/not_in_the_roster.png
Binary file res/drawable/not_in_the_roster.png has changed
diff -r 89f1be755b8d -r 7caab0161cf9 res/drawable/scrollbar_vertical_thumb.xml
--- a/res/drawable/scrollbar_vertical_thumb.xml	Mon Jul 16 11:43:10 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient android:startColor="#3333FF" android:endColor="#8080FF"
-            android:angle="0"/>
-    <corners android:radius="6dp" />
-</shape>
diff -r 89f1be755b8d -r 7caab0161cf9 res/drawable/scrollbar_vertical_track.xml
--- a/res/drawable/scrollbar_vertical_track.xml	Mon Jul 16 11:43:10 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient android:startColor="#505050" android:endColor="#C0C0C0"
-            android:angle="0"/>
-    <corners android:radius="0dp" />
-</shape>
diff -r 89f1be755b8d -r 7caab0161cf9 res/drawable/shape_border_green.xml
--- a/res/drawable/shape_border_green.xml	Mon Jul 16 11:43:10 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <stroke android:width="4dp" android:color="#D6F94C" />
-    <padding android:left="7dp" android:top="7dp"
-            android:right="7dp" android:bottom="7dp" />
-    <corners android:radius="4dp" />
-</shape>
diff -r 89f1be755b8d -r 7caab0161cf9 res/drawable/shape_line_green.xml
--- a/res/drawable/shape_line_green.xml	Mon Jul 16 11:43:10 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" type="line">
-<stroke android:width="1dp"
-		android:height="2dp"
-		android:color="#D6F94C" />
-	<size android:height="1dp" />
-</shape>
diff -r 89f1be755b8d -r 7caab0161cf9 res/drawable/status_available.png
Binary file res/drawable/status_available.png has changed
diff -r 89f1be755b8d -r 7caab0161cf9 res/drawable/status_away.png
Binary file res/drawable/status_away.png has changed
diff -r 89f1be755b8d -r 7caab0161cf9 res/drawable/status_blocked.png
Binary file res/drawable/status_blocked.png has changed
diff -r 89f1be755b8d -r 7caab0161cf9 res/drawable/status_dnd.png
Binary file res/drawable/status_dnd.png has changed
diff -r 89f1be755b8d -r 7caab0161cf9 res/drawable/status_error.png
Binary file res/drawable/status_error.png has changed
diff -r 89f1be755b8d -r 7caab0161cf9 res/drawable/status_icon.xml
--- a/res/drawable/status_icon.xml	Mon Jul 16 11:43:10 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Level list drawable for status icon
-    See src/com/beem/project/beem/utils/Status.java
-    for level values
--->
-<level-list xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:maxLevel="0" android:drawable="@android:drawable/presence_offline" />
-  <item android:maxLevel="1" android:drawable="@drawable/status_requested" />
-  <item android:maxLevel="2" android:drawable="@android:drawable/presence_away" />
-  <item android:maxLevel="4" android:drawable="@android:drawable/presence_busy" />
-  <item android:maxLevel="5" android:drawable="@android:drawable/presence_online" />
- </level-list>
diff -r 89f1be755b8d -r 7caab0161cf9 res/drawable/status_idle.png
Binary file res/drawable/status_idle.png has changed
diff -r 89f1be755b8d -r 7caab0161cf9 res/drawable/status_invisible.png
Binary file res/drawable/status_invisible.png has changed
diff -r 89f1be755b8d -r 7caab0161cf9 res/drawable/status_new_message.png
Binary file res/drawable/status_new_message.png has changed
diff -r 89f1be755b8d -r 7caab0161cf9 res/drawable/status_offline.png
Binary file res/drawable/status_offline.png has changed
diff -r 89f1be755b8d -r 7caab0161cf9 res/drawable/status_requested.png
Binary file res/drawable/status_requested.png has changed
diff -r 89f1be755b8d -r 7caab0161cf9 res/drawable/status_typing.png
Binary file res/drawable/status_typing.png has changed
diff -r 89f1be755b8d -r 7caab0161cf9 res/layout/addcontact.xml
--- a/res/layout/addcontact.xml	Mon Jul 16 11:43:10 2012 +0200
+++ b/res/layout/addcontact.xml	Mon Jul 16 15:43:55 2012 +0200
@@ -3,7 +3,7 @@
 	android:layout_width="fill_parent" android:layout_height="fill_parent"
 	android:orientation="vertical">
 	<LinearLayout android:layout_width="fill_parent"
-		android:layout_height="fill_parent" android:orientation="vertical"
+		android:layout_height="wrap_content" android:orientation="vertical"
 		android:padding="10dip">
 		<TextView android:layout_width="fill_parent"
 			android:layout_height="wrap_content" android:text="@string/AddCLogin"
diff -r 89f1be755b8d -r 7caab0161cf9 res/layout/changestatus.xml
--- a/res/layout/changestatus.xml	Mon Jul 16 11:43:10 2012 +0200
+++ b/res/layout/changestatus.xml	Mon Jul 16 15:43:55 2012 +0200
@@ -3,7 +3,7 @@
 	android:layout_width="fill_parent" android:layout_height="wrap_content"
 	android:orientation="vertical">
 	<RelativeLayout android:orientation="vertical"
-		android:layout_width="fill_parent" android:layout_height="fill_parent"
+		android:layout_width="fill_parent" android:layout_height="wrap_content"
 		android:padding="10dip">
 		<TextView android:id="@+id/ChangeStatusTypeLabel"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
@@ -16,10 +16,9 @@
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
 			android:layout_below="@id/ChangeStatusSpinner"
 			style="@style/Label"
-			android:inputType="textShortMessage|textCapSentences|textAutoCorrect|textMultiLine|textImeMultiLine"
-			android:imeOptions="actionDone"
 			android:selectAllOnFocus="true"
 			android:focusable="true"
+			android:text="@string/ChangeStatusMessage"
 			/>
 		<EditText android:id="@+id/ChangeStatusMessage"
 			android:inputType="textShortMessage|textAutoCorrect"
diff -r 89f1be755b8d -r 7caab0161cf9 res/layout/chat.xml
--- a/res/layout/chat.xml	Mon Jul 16 11:43:10 2012 +0200
+++ b/res/layout/chat.xml	Mon Jul 16 15:43:55 2012 +0200
@@ -5,7 +5,7 @@
 	<LinearLayout android:id="@+id/chat_header"
 		android:layout_width="fill_parent" android:layout_height="wrap_content"
 		android:orientation="horizontal" android:gravity="center_vertical"
-		android:background="#222222" android:padding="4px">
+		android:background="#222222" android:padding="4dp">
 		<ImageView android:id="@+id/chat_contact_status_icon"
 			android:src="@drawable/avatar_status"
 			android:layout_width="24dip"
@@ -36,12 +36,12 @@
 		android:layout_width="fill_parent" android:layout_height="0dip"
 		android:layout_weight="1" android:transcriptMode="normal"
 		android:stackFromBottom="true"
-		android:fadingEdge="none" android:padding="4px"
+		android:fadingEdge="none" android:padding="4dp"
 		android:fastScrollEnabled="true" android:smoothScrollbar="false"
 		android:focusable="true"/>
 	<LinearLayout android:layout_width="fill_parent"
 		android:layout_height="wrap_content" android:orientation="horizontal"
-		android:background="#222222" android:padding="8px">
+		android:background="#222222" android:padding="8dp">
 		<EditText android:id="@+id/chat_input" android:layout_width="0dip"
 			android:layout_height="fill_parent" android:layout_weight="1"
 			android:maxLines="5"
diff -r 89f1be755b8d -r 7caab0161cf9 res/layout/chat_compact.xml
--- a/res/layout/chat_compact.xml	Mon Jul 16 11:43:10 2012 +0200
+++ b/res/layout/chat_compact.xml	Mon Jul 16 15:43:55 2012 +0200
@@ -8,12 +8,12 @@
 		android:layout_width="fill_parent" android:layout_height="0dip"
 		android:layout_weight="1" android:transcriptMode="normal"
 		android:stackFromBottom="true"
-		android:fadingEdge="none" android:padding="4px"
+		android:fadingEdge="none" android:padding="4dp"
 		android:fastScrollEnabled="true" android:smoothScrollbar="false"
 		android:focusable="true"/>
 	<LinearLayout android:layout_width="fill_parent"
 		android:layout_height="wrap_content" android:orientation="horizontal"
-		android:background="#222222" android:padding="8px">
+		android:background="#222222" android:padding="8dp">
 		<EditText android:id="@+id/chat_input" android:layout_width="0dip"
 			android:layout_height="fill_parent" android:layout_weight="1"
 			android:maxLines="5"
diff -r 89f1be755b8d -r 7caab0161cf9 res/layout/contactdialogaliasdialog.xml
--- a/res/layout/contactdialogaliasdialog.xml	Mon Jul 16 11:43:10 2012 +0200
+++ b/res/layout/contactdialogaliasdialog.xml	Mon Jul 16 15:43:55 2012 +0200
@@ -10,7 +10,8 @@
 	<EditText android:id="@+id/CDAliasDialogName"
 		android:layout_height="wrap_content" android:layout_width="fill_parent"
 		android:layout_marginLeft="20dip" android:layout_marginRight="20dip"
-		android:scrollHorizontally="true" android:autoText="false"
-		android:capitalize="none" android:gravity="fill_horizontal"
-		android:contentDescription="@string/userinfo_label_alias"/>
+		android:scrollHorizontally="true" android:inputType="textPersonName"
+		android:gravity="fill_horizontal"
+		android:contentDescription="@string/userinfo_label_alias"
+		android:hint="@string/userinfo_alias_hint" />
 </LinearLayout>
diff -r 89f1be755b8d -r 7caab0161cf9 res/layout/contactlist.xml
--- a/res/layout/contactlist.xml	Mon Jul 16 11:43:10 2012 +0200
+++ b/res/layout/contactlist.xml	Mon Jul 16 15:43:55 2012 +0200
@@ -6,7 +6,7 @@
 		android:layout_height="wrap_content" android:layout="@layout/contactlist_groupstub"/>
 	<LinearLayout android:layout_width="fill_parent"
 		android:layout_height="fill_parent" android:orientation="horizontal"
-		android:padding="2px">
+		android:padding="2dp">
 		<ListView android:id="@+id/contactlist" android:layout_width="fill_parent"
 		    android:layout_height="fill_parent" android:transcriptMode="disabled"
 		    android:textFilterEnabled="true" />
diff -r 89f1be755b8d -r 7caab0161cf9 res/layout/contactlistcontact.xml
--- a/res/layout/contactlistcontact.xml	Mon Jul 16 11:43:10 2012 +0200
+++ b/res/layout/contactlistcontact.xml	Mon Jul 16 15:43:55 2012 +0200
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content" android:paddingLeft="10px"
-    android:paddingRight="10px" android:paddingTop="8dip"
+    android:layout_height="wrap_content" android:paddingLeft="10dp"
+    android:paddingRight="10dp" android:paddingTop="8dip"
     android:paddingBottom="8dip" >
     <ImageView android:id="@+id/avatar"
 	android:layout_width="48dip" android:layout_height="48dip"
@@ -15,7 +15,7 @@
 	android:layout_toRightOf="@id/avatar"
 	android:singleLine="true"
 	android:maxLines="1" android:textColor="@color/white"
-	android:drawablePadding="12px"
+	android:drawablePadding="12dp"
 	android:paddingLeft="10dip"
 	android:textSize="18sp" android:textStyle="bold" />
 
@@ -23,7 +23,7 @@
 	android:layout_width="fill_parent" android:layout_height="wrap_content"
 	android:layout_below="@id/contactlistpseudo"
 	android:layout_toRightOf="@id/avatar"
-	android:paddingLeft="30px" android:singleLine="true"
+	android:paddingLeft="30dp" android:singleLine="true"
 	android:maxLines="1" android:linksClickable="false" android:autoLink="all"
 	android:scrollHorizontally="true" android:textColorLink="@color/white"
 	android:textSize="12sp" />
diff -r 89f1be755b8d -r 7caab0161cf9 res/layout/create_account.xml
--- a/res/layout/create_account.xml	Mon Jul 16 11:43:10 2012 +0200
+++ b/res/layout/create_account.xml	Mon Jul 16 15:43:55 2012 +0200
@@ -3,7 +3,7 @@
 	android:layout_width="fill_parent" android:layout_height="fill_parent"
 	android:orientation="vertical">
 	<LinearLayout android:orientation="vertical"
-		android:layout_width="fill_parent" android:layout_height="fill_parent"
+		android:layout_width="fill_parent" android:layout_height="wrap_content"
 		android:padding="10dip">
 		<TextView android:id="@+id/create_account_label_username"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
@@ -19,7 +19,7 @@
 		<EditText android:id="@+id/create_account_password"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
 			android:inputType="textPassword" android:imeOptions="actionNext"
-			android:password="true" android:singleLine="true"
+			android:singleLine="true"
 			android:contentDescription="@string/create_account_password"/>
 		<TextView android:id="@+id/create_account_label_confirm_password"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
@@ -27,9 +27,9 @@
 		<EditText android:id="@+id/create_account_confirm_password"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
 			android:inputType="textPassword" android:imeOptions="actionNext"
-			android:password="true" android:singleLine="true"
+			android:singleLine="true"
 			android:contentDescription="@string/create_account_confirm_password"/>
-		<View android:layout_width="fill_parent" android:layout_height="wrap_content"
+		<View android:layout_width="fill_parent" android:layout_height="0dip"
 			android:layout_weight="1" android:layout_marginBottom="18dp" />
 		<Button android:id="@+id/create_account_button"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
diff -r 89f1be755b8d -r 7caab0161cf9 res/layout/jingle_call_activity.xml
--- a/res/layout/jingle_call_activity.xml	Mon Jul 16 11:43:10 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent" android:layout_height="wrap_content"
-	android:orientation="vertical">
-<!--         <TextView android:text="Jid:" android:id="@+id/jingledemocalljidlabel"
-		android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>
-	<EditText android:id="@+id/jingledemocalljid"
-		android:layout_width="fill_parent" android:layout_height="wrap_content"></EditText>
-	<TextView android:text="Password:" android:id="@+id/jingledemocallpasswordlabel"
-		android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>
-	<EditText android:id="@+id/jingledemocallpassword"
-		android:layout_width="fill_parent" android:layout_height="wrap_content" android:inputType="textPassword" ></EditText>
-
-	<Button android:text="Connexion" android:id="@+id/jingledemocallconnectbutton"
-		android:layout_width="wrap_content" android:layout_height="wrap_content"></Button>
-	<TextView android:text="Call who :" android:id="@+id/jingledemocallreceiverlabel"
-		android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>
-
-<EditText android:text="" android:id="@+id/jingledemocallreceiver" android:layout_width="fill_parent" android:layout_height="wrap_content"></EditText>
-
-<Button android:text="Call" android:id="@+id/jingledemocallbutton" android:layout_width="wrap_content" android:layout_height="wrap_content"></Button>       -->
-<ImageView android:id="@+id/log_as_logo"
-    android:layout_width="fill_parent" android:layout_height="wrap_content"
-    android:layout_marginBottom="25px" android:layout_marginTop="42px" />
-</LinearLayout>
diff -r 89f1be755b8d -r 7caab0161cf9 res/layout/login.xml
--- a/res/layout/login.xml	Mon Jul 16 11:43:10 2012 +0200
+++ b/res/layout/login.xml	Mon Jul 16 15:43:55 2012 +0200
@@ -9,8 +9,8 @@
 		android:src="@drawable/logo"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="25px"
-		android:layout_marginTop="42px" />
+		android:layout_marginBottom="25dp"
+		android:layout_marginTop="42dp" />
 	<ListView
 		android:id="@+id/accountlist"
 		android:layout_width="fill_parent"
diff -r 89f1be755b8d -r 7caab0161cf9 res/layout/login_anim.xml
--- a/res/layout/login_anim.xml	Mon Jul 16 11:43:10 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_height="fill_parent" android:layout_width="fill_parent"
-	android:orientation="vertical">
-	<ImageView android:id="@+id/loginanim_logo_anim" android:src="@drawable/beem_status_icon_offline"
-		android:layout_height="0dip" android:layout_width="wrap_content"
-		android:layout_gravity="center_vertical|center_horizontal|center"
-		android:layout_weight="1" />
-	<TextView android:id="@+id/loginanim_status_text"
-		android:layout_width="fill_parent" android:layout_height="wrap_content"
-		android:textSize="20sp" android:gravity="center" android:textColor="@color/vert_manu"/>
-	<Button android:id="@+id/loginanim_cancel_button"
-		android:layout_height="wrap_content" android:layout_width="fill_parent"
-		android:layout_gravity="bottom" android:text="@string/CancelButton" />
-</LinearLayout>
-
diff -r 89f1be755b8d -r 7caab0161cf9 res/layout/login_row_account.xml
--- a/res/layout/login_row_account.xml	Mon Jul 16 11:43:10 2012 +0200
+++ b/res/layout/login_row_account.xml	Mon Jul 16 15:43:55 2012 +0200
@@ -3,8 +3,8 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:paddingLeft="10px"
-	android:paddingRight="10px"
+	android:paddingLeft="10dip"
+	android:paddingRight="10dip"
 	android:paddingTop="8dip"
 	android:paddingBottom="8dip">
 	<ImageButton
@@ -12,9 +12,8 @@
 		android:layout_width="48dip"
 		android:layout_height="48dip"
 		android:layout_gravity="center_vertical|center_horizontal|center"
-		android:layout_weight="1"
 		android:background="@android:color/transparent"
-		android:onClick="BeemConnectionOnClick" />
+		android:contentDescription="@string/contentdesc_loginanim_logo_anim" />
 	<TextView
 		android:id="@+id/accountname"
 		android:layout_width="fill_parent"
@@ -24,7 +23,7 @@
 		android:singleLine="true"
 		android:maxLines="1"
 		android:textColor="@color/white"
-		android:drawablePadding="12px"
+		android:drawablePadding="12dip"
 		android:paddingLeft="10dip"
 		android:textSize="18sp"
 		android:textStyle="bold" />
@@ -34,7 +33,7 @@
 		android:layout_height="wrap_content"
 		android:layout_below="@+id/accountname"
 		android:layout_toRightOf="@id/loginanim_logo_anim"
-		android:paddingLeft="30px"
+		android:paddingLeft="30dip"
 		android:singleLine="true"
 		android:maxLines="1"
 		android:linksClickable="false"
diff -r 89f1be755b8d -r 7caab0161cf9 res/layout/preferences.xml
--- a/res/layout/preferences.xml	Mon Jul 16 11:43:10 2012 +0200
+++ b/res/layout/preferences.xml	Mon Jul 16 15:43:55 2012 +0200
@@ -101,7 +101,7 @@
 		<EditTextPreference
 			android:name="password"
 			android:singleLine="true"
-			android:password="true"
+			android:inputType="textPassword"
 			android:summary="@string/SettingsPassword"
 			android:title="@string/settings_account_password"
 			android:key="account_password" />
@@ -117,7 +117,7 @@
 			android:key="settings_key_priority"
 			android:title="@string/SettingsPriorityTitle"
 			android:summary="@string/SettingsPrioritySummary"
-			android:numeric="signed"
+			android:inputType="numberSigned"
 			android:defaultValue="0" />
 	</PreferenceCategory>
 	<PreferenceCategory
@@ -155,7 +155,7 @@
 					android:summary="@string/SettingsProxyPort"
 					android:title="@string/settings_proxy_port"
 					android:key="proxy_port"
-					android:numeric="signed"
+					android:inputType="numberSigned"
 					android:hint="@string/comments_proxy_port" />
 			</PreferenceCategory>
 			<PreferenceCategory
@@ -171,7 +171,7 @@
 					android:singleLine="true"
 					android:dependency="proxy_use"
 					android:name="pass_user"
-					android:password="true"
+					android:inputType="textPassword"
 					android:summary="@string/SettingsProxyPassword"
 					android:title="@string/settings_proxy_password"
 					android:key="proxy_password" />
@@ -219,7 +219,7 @@
 				android:summary="@string/SettingsAdvancedPortOpt"
 				android:title="@string/settings_xmpp_port"
 				android:defaultValue="5222"
-				android:numeric="signed"
+				android:inputType="numberSigned"
 				android:key="settings_key_xmpp_port"
 				android:hint="@string/comments_xmpp_port" />
 			<CheckBoxPreference
diff -r 89f1be755b8d -r 7caab0161cf9 res/layout/privacy_list.xml
--- a/res/layout/privacy_list.xml	Mon Jul 16 11:43:10 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical" android:layout_width="fill_parent"
-	android:layout_height="fill_parent" android:padding="8dp">
-	<ListView android:id="@id/android:list" android:layout_width="fill_parent"
-		android:layout_height="fill_parent" android:layout_weight="1"
-		android:drawSelectorOnTop="false"
-		android:focusable="true"/>
-	<TextView android:id="@id/android:empty" android:layout_width="fill_parent"
-		android:layout_height="fill_parent" android:text="@string/privacy_list_no_data"
-		android:focusable="true"/>
-</LinearLayout>
diff -r 89f1be755b8d -r 7caab0161cf9 res/layout/privacy_list_create_dialog.xml
--- a/res/layout/privacy_list_create_dialog.xml	Mon Jul 16 11:43:10 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent" android:layout_height="wrap_content"
-	android:orientation="vertical">
-	<TextView android:id="@+id/privacy_list_create_dialog_list_name_label"
-		android:layout_height="wrap_content" android:layout_width="wrap_content"
-		android:layout_marginLeft="20dip" android:layout_marginRight="20dip"
-		android:text="@string/privacy_list_create_dialog_list_name_label" android:gravity="left"
-		style="@style/Label" />
-	<EditText android:id="@+id/privacy_list_create_dialog_list_name"
-		android:layout_height="wrap_content" android:layout_width="fill_parent"
-		android:layout_marginLeft="20dip" android:layout_marginRight="20dip"
-		android:scrollHorizontally="true" android:autoText="false"
-		android:capitalize="none" android:gravity="fill_horizontal"
-		android:contentDescription="@string/privacy_list_create_dialog_list_name_label"/>
-</LinearLayout>
diff -r 89f1be755b8d -r 7caab0161cf9 res/layout/subscription.xml
--- a/res/layout/subscription.xml	Mon Jul 16 11:43:10 2012 +0200
+++ b/res/layout/subscription.xml	Mon Jul 16 15:43:55 2012 +0200
@@ -3,7 +3,7 @@
 	android:layout_width="fill_parent" android:layout_height="fill_parent"
 	android:orientation="vertical">
 	<LinearLayout android:orientation="vertical"
-		android:layout_width="fill_parent" android:layout_height="fill_parent"
+		android:layout_width="fill_parent" android:layout_height="wrap_content"
 		android:padding="10dip">
 
 		<TextView android:layout_width="wrap_content"
@@ -13,7 +13,7 @@
 			android:textSize="18sp" android:layout_marginBottom="10dip" />
 
 		<TextView android:layout_width="wrap_content"
-			android:layout_height="fill_parent" android:autoLink="none"
+			android:layout_height="0dip" android:autoLink="none"
 			android:id="@+id/SubscriptionText" android:text="@string/SubscriptText"
 			android:textColor="@color/white" android:textSize="14sp"
 			android:layout_weight="1" android:layout_marginBottom="18dp"
diff -r 89f1be755b8d -r 7caab0161cf9 res/layout/wizard_account.xml
--- a/res/layout/wizard_account.xml	Mon Jul 16 11:43:10 2012 +0200
+++ b/res/layout/wizard_account.xml	Mon Jul 16 15:43:55 2012 +0200
@@ -3,7 +3,7 @@
     android:layout_height="fill_parent" android:layout_width="fill_parent"
     android:orientation="vertical"
     >
-    <ScrollView android:layout_height="fill_parent" android:layout_width="fill_parent" 
+    <ScrollView android:layout_height="0dip" android:layout_width="fill_parent" 
 	android:layout_weight="1">
 	<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent"
 	    android:orientation="vertical" >
@@ -11,7 +11,8 @@
 		android:layout_width="fill_parent" android:layout_height="wrap_content"
 		android:layout_marginTop="15dp"
 		android:layout_marginBottom="30dp"
-		android:src="@drawable/logo"/>
+		android:src="@drawable/logo"
+		android:contentDescription="@string/contentdesc_logo" />
 	    <TextView
 		android:layout_width="fill_parent" android:layout_height="wrap_content"
 		android:text="@string/account_wizard_text1"
@@ -30,8 +31,7 @@
 	</LinearLayout>
     </ScrollView>
 
-    <RelativeLayout
-	android:layout_alignParentBottom="true"
+    <RelativeLayout	
 	android:gravity="right|center_vertical"
 	android:layout_height="wrap_content"
 	android:layout_width="fill_parent"
diff -r 89f1be755b8d -r 7caab0161cf9 res/layout/wizard_account_configure.xml
--- a/res/layout/wizard_account_configure.xml	Mon Jul 16 11:43:10 2012 +0200
+++ b/res/layout/wizard_account_configure.xml	Mon Jul 16 15:43:55 2012 +0200
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="fill_parent" android:layout_width="fill_parent"
     android:orientation="vertical" >
-    <ScrollView android:layout_height="fill_parent" android:layout_width="fill_parent" 
+    <ScrollView android:layout_height="0dip" android:layout_width="fill_parent" 
 	android:layout_weight="1">
 	<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent"
 	    android:orientation="vertical" >
@@ -12,8 +12,7 @@
 		android:layout_marginBottom="30dp"
 		android:src="@drawable/logo"/>
 	    <TextView
-		android:layout_width="fill_parent" android:layout_height="wrap_content"
-		android:layout_alignParentTop="true"
+		android:layout_width="fill_parent" android:layout_height="wrap_content"		
 		android:text="@string/account_wizard_configure_text"
 		android:textSize="18sp"
 		android:paddingBottom="10dip" />
@@ -32,13 +31,11 @@
 	    <EditText android:id="@+id/account_password"
 		android:layout_width="fill_parent" android:layout_height="wrap_content"
 		android:inputType="textPassword" android:imeOptions="actionNext"
-		android:password="true" android:singleLine="true"
-		android:contentDescription="@string/Password"/>
+		android:singleLine="true" android:contentDescription="@string/Password"/>
 	</LinearLayout>
     </ScrollView>
 
-    <RelativeLayout
-	android:layout_alignParentBottom="true"
+    <RelativeLayout	
 	android:gravity="right"
 	android:layout_height="wrap_content"
 	android:layout_width="fill_parent"
diff -r 89f1be755b8d -r 7caab0161cf9 res/menu/create_account.xml
--- a/res/menu/create_account.xml	Mon Jul 16 11:43:10 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-</menu>
diff -r 89f1be755b8d -r 7caab0161cf9 res/menu/privacy_list.xml
--- a/res/menu/privacy_list.xml	Mon Jul 16 11:43:10 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:id="@+id/privacy_list_menu_create" android:visible="true"
-		android:title="@string/privacy_list_menu_create" android:icon="@android:drawable/ic_menu_add" />
-</menu>
diff -r 89f1be755b8d -r 7caab0161cf9 res/menu/privacy_list_context.xml
--- a/res/menu/privacy_list_context.xml	Mon Jul 16 11:43:10 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:id="@+id/privacy_list_context_menu_buddies_item"
-		android:title="@string/privacy_list_select_dialog_buddies" />
-	<item android:id="@+id/privacy_list_context_menu_groups_item"
-		android:title="@string/privacy_list_select_dialog_groups" />
-	<item android:id="@+id/privacy_list_context_menu_delete_item"
-		android:title="@string/privacy_list_select_dialog_delete" />
-</menu>
diff -r 89f1be755b8d -r 7caab0161cf9 res/values/arrays.xml
--- a/res/values/arrays.xml	Mon Jul 16 11:43:10 2012 +0200
+++ b/res/values/arrays.xml	Mon Jul 16 15:43:55 2012 +0200
@@ -13,15 +13,4 @@
 		<item value="200" name="200">@string/contact_status_msg_xa</item>
 		<item value="100" name="100">@string/contact_status_msg_offline</item>
 	</string-array>
-	<string-array name="privacy_list_select_dialog">
-		<item name="@string/privacy_list_select_dialog_buddies">Buddies</item>
-		<item name="@string/privacy_list_select_dialog_groups">Groups</item>
-		<item name="@string/privacy_list_select_dialog_delete">Delete</item>
-	</string-array>
-	<string-array name="loganim_state">
-		<item>@string/loganim_connecting</item>
-		<item>@string/loganim_authenticating</item>
-		<item>@string/loganim_login_success</item>
-		<item>@string/loganim_login_failed</item>
-	</string-array>
 </resources>
diff -r 89f1be755b8d -r 7caab0161cf9 res/values/colors.xml
--- a/res/values/colors.xml	Mon Jul 16 11:43:10 2012 +0200
+++ b/res/values/colors.xml	Mon Jul 16 15:43:55 2012 +0200
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<color name="blue_sky">#A0C8FF</color>
-	<color name="vert_manu">#CCFF00</color>
-	<color name="vert_manu_hl">#BCFF00</color>
+<resources>	
+	<color name="vert_manu">#CCFF00</color>	
 	<color name="black">#000000</color>
 	<color name="white">#FFFFFF</color>
-	<color name="red">#FF0000</color>
 </resources>
\ No newline at end of file
diff -r 89f1be755b8d -r 7caab0161cf9 res/values/strings.xml
--- a/res/values/strings.xml	Mon Jul 16 11:43:10 2012 +0200
+++ b/res/values/strings.xml	Mon Jul 16 15:43:55 2012 +0200
@@ -2,7 +2,7 @@
 <resources>
 	<!-- Generic terms -->
 	<string name="app_name">Beem</string>
-	<string name="OkButton">Ok</string>
+	<string name="OkButton">OK</string>
 	<string name="ClearButton">Clear</string>
 	<string name="CancelButton">Cancel</string>
 	<string name="AcceptButton">Authorize</string>
@@ -14,17 +14,8 @@
 	<!--  AccountConfigure class -->
 	<string name="AccountConfigureManualConfiguration">Manual Configuration</string>
 
-	<!--  Beem class -->
-	<string name="BeemJabberID">Jabber ID</string>
-
-	<!--  BeemApplication class -->
-	<string name="BeemApplicationConnect">Connecting...</string>
-
 	<!--  BeemService class -->
 	<string name="BeemServiceDescription">Use Beem Service</string>
-	<string name="BeemServiceCreated">Beem Service Created</string>
-	<string name="BeemServiceDestroyed">Beem Service Destroyed</string>
-	<string name="BeemServiceNotConnected">Problem : Account %s not connected</string>
 
 	<!--  ContactDialog class -->
 	<string name="CDChat">Chat</string>
@@ -137,7 +128,7 @@
 	<string name="history_mount">You need to have SDcard mounted and writable to enable history</string>
 	<string name="history_on_off">Enable history messages</string>
 	<string name="chat_preferences">Chat</string>
-	<string name="chat_preferences_sum">History, Layout size ...</string>
+	<string name="chat_preferences_sum">History, Layout size &#8230;</string>
 	<string name="chat_history_path">History path</string>
 	<string name="chat_history_path_sum">Chat conversations are saved in a folder on the SDCard</string>
 	<string name="settings_smack_debug">Enable XMPP debug</string>
@@ -191,18 +182,18 @@
 	<string name="login_about_button">Close</string>
 	<string name="login_settings_button">Settings</string>
 	<string name="login_login_button">Log in</string>
-	<string name="login_login_progress">Connecting. Please wait...</string>
+	<string name="login_login_progress">Connecting. Please wait&#8230;</string>
 	<string name="login_error_msg">Unfortunately, an error occured.\n\nError
 		detail:\n%s</string>
 	<string name="login_menu_login">Login</string>
 	<string name="login_no_connectivity">No internet connection found</string>
 	<string name="login_start_msg">Settings configuration in menu</string>
-	<string name="login_pending">Pending ...</string>
+	<string name="login_pending">Pending &#8230;</string>
 	<string name="login_create_account">Create account</string>
 
 	<!-- LoginAnim activity -->
-	<string name="loganim_connecting">Connecting ...</string>
-	<string name="loganim_authenticating">Authenticating ...</string>
+	<string name="loganim_connecting">Connecting &#8230;</string>
+	<string name="loganim_authenticating">Authenticating &#8230;</string>
 	<string name="loganim_login_success">Login success</string>
 	<string name="loganim_login_failed">Login failed</string>
 
@@ -273,6 +264,7 @@
 	<string name="userinfo_yes">Yes</string>
 	<string name="userinfo_no">No</string>
 	<string name="userinfo_sureresend">Are you sure you want to resend invit?</string>
+	<string name="userinfo_alias_hint">Alias</string>
 
 	<string name="chat_name">Beem - Chat</string>
 	<string name="chat_input_default_value">Type your message</string>
diff -r 89f1be755b8d -r 7caab0161cf9 res/values/strings_content_description.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/res/values/strings_content_description.xml	Mon Jul 16 15:43:55 2012 +0200
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="contentdesc_loginanim_logo_anim">logo anim</string>
+    <string name="contentdesc_logo">logo</string>
+
+</resources>
\ No newline at end of file