# HG changeset patch
# User Da Risk <darisk972@gmail.com>
# Date 1276193283 -7200
# Node ID 0fb9a16d7c32e34560b8a9b48f6d48cf6e62802a
# Parent  fb7f6f98585e914d9ede386edac5fafdd1fd1c23# Parent  be86f7f9b875a0949ed3cbec09ec6e8d715444bc
merge

diff -r fb7f6f98585e -r 0fb9a16d7c32 CREDITS
--- a/CREDITS	Thu Jun 10 20:05:23 2010 +0200
+++ b/CREDITS	Thu Jun 10 20:08:03 2010 +0200
@@ -1,9 +1,19 @@
 This file contains the name of the people who have contributed to
 BEEM. The names are sorted alphabetically by last name.
 
+Core Team :
 Frederic-Charles Barthelery
 Jean-Manuel Da Silva
 Nikita Kozlov
 Philippe Lago
 Jean Baptiste Vergely
 Vincent Véronis
+
+Contributors :
+Nolan Darilek
+
+Tranlators :
+GoApk http://goapk.com for chinese translations
+
+Thanks to all !
+
diff -r fb7f6f98585e -r 0fb9a16d7c32 res/layout/addcontact.xml
--- a/res/layout/addcontact.xml	Thu Jun 10 20:05:23 2010 +0200
+++ b/res/layout/addcontact.xml	Thu Jun 10 20:08:03 2010 +0200
@@ -11,21 +11,24 @@
 		<EditText android:id="@+id/addc_login" android:inputType="textEmailAddress"
 			android:imeOptions="actionNext" android:scrollHorizontally="true"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
-			android:layout_margin="3dip" />
+			android:layout_margin="3dip"
+			android:contentDescription="@string/AddCLogin"/>
 		<TextView android:layout_width="fill_parent"
 			android:layout_height="wrap_content" android:text="@string/AddCAlias"
 			style="@style/Label" />
 		<EditText android:id="@+id/addc_alias" android:inputType="text"
 			android:imeOptions="actionNext" android:textSize="16sp"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
-			android:scrollHorizontally="true" android:layout_margin="3dip" />
+			android:scrollHorizontally="true" android:layout_margin="3dip"
+			android:contentDescription="@string/AddCAlias"/>
 		<TextView android:layout_width="fill_parent"
 			android:layout_height="wrap_content" android:text="@string/AddCGroup"
 			style="@style/Label" />
 		<EditText android:id="@+id/addc_group" android:inputType="text"
 			android:textSize="16sp" android:layout_width="fill_parent"
 			android:scrollHorizontally="true" android:layout_height="wrap_content"
-			android:layout_margin="3dip" />
+			android:layout_margin="3dip"
+			android:contentDescription="@string/AddCGroup"/>
 		<View android:layout_width="fill_parent" android:layout_height="wrap_content"
 			android:layout_weight="1" android:layout_marginBottom="18dp" />
 		<Button android:id="@+id/addc_ok" android:layout_width="fill_parent"
diff -r fb7f6f98585e -r 0fb9a16d7c32 res/layout/changestatus.xml
--- a/res/layout/changestatus.xml	Thu Jun 10 20:05:23 2010 +0200
+++ b/res/layout/changestatus.xml	Thu Jun 10 20:08:03 2010 +0200
@@ -10,7 +10,8 @@
 			android:text="@string/ChangeStatusType" style="@style/Label" />
 		<Spinner android:id="@+id/ChangeStatusSpinner"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
-			android:drawSelectorOnTop="true" android:layout_below="@id/ChangeStatusTypeLabel" />
+			android:drawSelectorOnTop="true" android:layout_below="@id/ChangeStatusTypeLabel"
+			android:contentDescription="@string/ChangeStatusType"/>
 		<TextView android:id="@+id/ChangeStatusMessageLabel"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
 			android:layout_below="@id/ChangeStatusSpinner"
@@ -18,6 +19,7 @@
 			android:inputType="textShortMessage|textCapSentences|textAutoCorrect|textMultiLine|textImeMultiLine"
 			android:imeOptions="actionDone"
 			android:selectAllOnFocus="true"
+			android:focusable="true"
 			/>
 		<EditText android:id="@+id/ChangeStatusMessage"
 			android:inputType="textShortMessage|textAutoCorrect"
diff -r fb7f6f98585e -r 0fb9a16d7c32 res/layout/chat.xml
--- a/res/layout/chat.xml	Thu Jun 10 20:05:23 2010 +0200
+++ b/res/layout/chat.xml	Thu Jun 10 20:08:03 2010 +0200
@@ -16,14 +16,17 @@
 			<TextView android:id="@+id/chat_contact_name"
 				android:layout_width="fill_parent" android:layout_height="wrap_content"
 				android:lines="1" android:singleLine="true" android:textSize="16sp"
-				android:textStyle="bold" android:textColor="#FFFFFF" />
+				android:textStyle="bold" android:textColor="#FFFFFF"
+				android:focusable="true"/>
 			<TextView android:id="@+id/chat_contact_status_msg"
 				android:layout_width="fill_parent" android:layout_height="wrap_content"
 				android:autoLink="all" android:textSize="12sp" android:textColor="#FFFFFF"
-				android:textColorLink="#FFFFFF" />
+				android:textColorLink="#FFFFFF"
+				android:focusable="true"/>
 			<TextView android:id="@+id/chat_contact_chat_state"
 				android:layout_width="fill_parent" android:layout_height="wrap_content"
-				android:textStyle="italic" android:textSize="12sp" />
+				android:textStyle="italic" android:textSize="12sp"
+				android:focusable="true"/>
 		</LinearLayout>
 	</LinearLayout>
 	<View android:layout_width="fill_parent" android:layout_height="2dp"
@@ -33,7 +36,8 @@
 		android:layout_weight="1" android:transcriptMode="normal"
 		android:stackFromBottom="true"
 		android:fastScrollEnabled="true" android:smoothScrollbar="false"
-		android:layout_marginBottom="20sp" android:padding="4px" />
+		android:layout_marginBottom="20sp" android:padding="4px"
+		android:focusable="true"/>
 	<LinearLayout android:layout_width="fill_parent"
 		android:layout_height="wrap_content" android:orientation="horizontal"
 		android:background="#222222" android:padding="8px">
diff -r fb7f6f98585e -r 0fb9a16d7c32 res/layout/contactdialogaliasdialog.xml
--- a/res/layout/contactdialogaliasdialog.xml	Thu Jun 10 20:05:23 2010 +0200
+++ b/res/layout/contactdialogaliasdialog.xml	Thu Jun 10 20:08:03 2010 +0200
@@ -11,5 +11,6 @@
 		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:capitalize="none" android:gravity="fill_horizontal"
+		android:contentDescription="@string/userinfo_label_alias"/>
 </LinearLayout>
diff -r fb7f6f98585e -r 0fb9a16d7c32 res/layout/create_account.xml
--- a/res/layout/create_account.xml	Thu Jun 10 20:05:23 2010 +0200
+++ b/res/layout/create_account.xml	Thu Jun 10 20:08:03 2010 +0200
@@ -11,21 +11,24 @@
 		<EditText android:id="@+id/create_account_username"
 			android:inputType="textEmailAddress" android:imeOptions="actionNext"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
-			android:singleLine="true" />
+			android:singleLine="true"
+			android:contentDescription="@string/create_account_username"/>
 		<TextView android:id="@+id/create_account_label_password"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
 			android:text="@string/create_account_password" style="@style/Label" />
 		<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:password="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"
 			android:text="@string/create_account_confirm_password" style="@style/Label" />
 		<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:password="true" android:singleLine="true"
+			android:contentDescription="@string/create_account_confirm_password"/>
 		<View android:layout_width="fill_parent" android:layout_height="wrap_content"
 			android:layout_weight="1" android:layout_marginBottom="18dp" />
 		<Button android:id="@+id/create_account_button"
diff -r fb7f6f98585e -r 0fb9a16d7c32 res/layout/group_list.xml
--- a/res/layout/group_list.xml	Thu Jun 10 20:05:23 2010 +0200
+++ b/res/layout/group_list.xml	Thu Jun 10 20:08:03 2010 +0200
@@ -5,11 +5,12 @@
 
 	<ListView android:id="@android:id/list" android:layout_width="fill_parent"
 		android:layout_height="0dip" android:layout_weight="1"
-		android:stackFromBottom="true" android:transcriptMode="normal" />
+		android:stackFromBottom="true" android:transcriptMode="normal"
+		android:focusable="true"/>
 
 	<EditText android:id="@+id/GroupListText"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
 		android:maxLength="20"
 		android:singleLine="true" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff -r fb7f6f98585e -r 0fb9a16d7c32 res/layout/privacy_list.xml
--- a/res/layout/privacy_list.xml	Thu Jun 10 20:05:23 2010 +0200
+++ b/res/layout/privacy_list.xml	Thu Jun 10 20:08:03 2010 +0200
@@ -4,7 +4,9 @@
 	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: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:layout_height="fill_parent" android:text="@string/privacy_list_no_data"
+		android:focusable="true"/>
 </LinearLayout>
diff -r fb7f6f98585e -r 0fb9a16d7c32 res/layout/privacy_list_create_dialog.xml
--- a/res/layout/privacy_list_create_dialog.xml	Thu Jun 10 20:05:23 2010 +0200
+++ b/res/layout/privacy_list_create_dialog.xml	Thu Jun 10 20:08:03 2010 +0200
@@ -10,5 +10,6 @@
 		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:capitalize="none" android:gravity="fill_horizontal"
+		android:contentDescription="@string/privacy_list_create_dialog_list_name_label"/>
 </LinearLayout>
diff -r fb7f6f98585e -r 0fb9a16d7c32 res/layout/subscription.xml
--- a/res/layout/subscription.xml	Thu Jun 10 20:05:23 2010 +0200
+++ b/res/layout/subscription.xml	Thu Jun 10 20:08:03 2010 +0200
@@ -16,7 +16,8 @@
 			android:layout_height="fill_parent" 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" />
+			android:layout_weight="1" android:layout_marginBottom="18dp"
+			android:focusable="true"/>
 
 		<LinearLayout android:orientation="horizontal"
 			android:layout_width="fill_parent" android:layout_height="wrap_content">
@@ -30,4 +31,4 @@
 				android:layout_weight="1" android:text="@string/RefuseButton" />
 		</LinearLayout>
 	</LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff -r fb7f6f98585e -r 0fb9a16d7c32 res/layout/wizard_account.xml
--- a/res/layout/wizard_account.xml	Thu Jun 10 20:05:23 2010 +0200
+++ b/res/layout/wizard_account.xml	Thu Jun 10 20:08:03 2010 +0200
@@ -16,7 +16,8 @@
 		android:layout_width="fill_parent" android:layout_height="wrap_content"
 		android:text="@string/account_wizard_text1"
 		android:textSize="18sp"
-		android:paddingBottom="10dip" />
+		android:paddingBottom="10dip"
+		android:focusable="true" />
 	    <RadioGroup android:id="@+id/configure_group"
 		android:layout_width="fill_parent" android:layout_height="wrap_content" >
 		<RadioButton android:id="@+id/configure_account"
diff -r fb7f6f98585e -r 0fb9a16d7c32 res/layout/wizard_account_configure.xml
--- a/res/layout/wizard_account_configure.xml	Thu Jun 10 20:05:23 2010 +0200
+++ b/res/layout/wizard_account_configure.xml	Thu Jun 10 20:08:03 2010 +0200
@@ -24,14 +24,16 @@
 		android:inputType="textEmailAddress" android:imeOptions="actionNext"
 		android:layout_width="fill_parent" android:layout_height="wrap_content"
 		android:singleLine="true" 
-		android:hint="beem@beem-project.com "/>
+		android:hint="beem@beem-project.com "
+		android:contentDescription="@string/JabberID"/>
 	    <TextView
 		android:layout_width="fill_parent" android:layout_height="wrap_content"
 		android:text="@string/Password" style="@style/Label" />
 	    <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:password="true" android:singleLine="true"
+		android:contentDescription="@string/Password"/>
 	</LinearLayout>
     </ScrollView>
 
diff -r fb7f6f98585e -r 0fb9a16d7c32 src/com/beem/project/beem/ui/Chat.java
--- a/src/com/beem/project/beem/ui/Chat.java	Thu Jun 10 20:05:23 2010 +0200
+++ b/src/com/beem/project/beem/ui/Chat.java	Thu Jun 10 20:08:03 2010 +0200
@@ -160,6 +160,7 @@
 	mMessagesListView.setAdapter(mMessagesListAdapter);
 	mInputField = (EditText) findViewById(R.id.chat_input);
 	mInputField.setOnKeyListener(this);
+	mInputField.requestFocus();
 	mSendButton = (Button) findViewById(R.id.chat_send_message);
 	mSendButton.setOnClickListener(new OnClickListener() {
 	    @Override
diff -r fb7f6f98585e -r 0fb9a16d7c32 src/com/beem/project/beem/ui/ContactList.java
--- a/src/com/beem/project/beem/ui/ContactList.java	Thu Jun 10 20:05:23 2010 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java	Thu Jun 10 20:08:03 2010 +0200
@@ -659,7 +659,7 @@
 	    /**
 	     * Create a ContactFilter.
 	     */
-	    public ContactFilter() {}
+	    public ContactFilter() { }
 
 	    @Override
 	    protected Filter.FilterResults performFiltering(CharSequence constraint) {