Merge branch 'master' of https://github.com/lizardlab/xabber-android into lizardlab-master

Conflicts:
	app/src/main/res/xml/preference_editor.xml

README.rst

@@ -37,3 +37,8 @@ All related resources are automatically generated from files got with webtransla
 If you want to update any translation please email us to info[at]xabber.com and specify all the translation languages you want to edit.
 Then we'll send an invitation to our project on webtranslateit.com.
 Please don't create pull requests with translation fixes as any changes will be overwritten with the next update from webtranslateit.com.
+
+Wiki
+====
+
+Visit our wiki pages for additional information: https://github.com/redsolution/xabber-android/wiki

app/src/main/res/xml/account_editor_oauth.xml

@@ -53,6 +53,7 @@
     <EditTextPreference
         android:key="@string/account_proxy_port_key"
         android:title="@string/account_proxy_port"
+        android:inputType="number"
         android:singleLine="true"
         />
     <EditTextPreference

app/src/main/res/xml/account_editor_xmpp.xml

@@ -66,6 +66,7 @@
         android:key="@string/account_port_key"
         android:title="@string/account_port"
         android:singleLine="true"
+        android:inputType="number"
         android:dependency="@string/account_custom_key"
         />
     <EditTextPreference
@@ -76,6 +77,7 @@
     <com.xabber.android.ui.widget.PriorityPreference
         android:key="@string/account_priority_key"
         android:title="@string/account_priority"
+        android:inputType="numberSigned"
         android:singleLine="true"
         />
     <CheckBoxPreference
@@ -108,6 +110,7 @@
     <EditTextPreference
         android:key="@string/account_proxy_port_key"
         android:title="@string/account_proxy_port"
+        android:inputType="number"
         android:singleLine="true"
         />
     <EditTextPreference

app/src/main/res/xml/preference_connection.xml

@@ -47,6 +47,7 @@
             android:defaultValue="@string/connection_priority_chat_default"
             android:dependency="@string/connection_adjust_priority_key"
             android:title="@string/chat"
+            android:inputType="numberSigned"
             android:singleLine="true"
             />
         <com.xabber.android.ui.widget.PriorityPreference
@@ -54,6 +55,7 @@
             android:defaultValue="@string/connection_priority_available_default"
             android:dependency="@string/connection_adjust_priority_key"
             android:title="@string/available"
+            android:inputType="numberSigned"
             android:singleLine="true"
             />
         <com.xabber.android.ui.widget.PriorityPreference
@@ -61,6 +63,7 @@
             android:defaultValue="@string/connection_priority_away_default"
             android:dependency="@string/connection_adjust_priority_key"
             android:title="@string/away"
+            android:inputType="numberSigned"
             android:singleLine="true"
             />
         <com.xabber.android.ui.widget.PriorityPreference
@@ -68,6 +71,7 @@
             android:defaultValue="@string/connection_priority_xa_default"
             android:dependency="@string/connection_adjust_priority_key"
             android:title="@string/xa"
+            android:inputType="numberSigned"
             android:singleLine="true"
             />
         <com.xabber.android.ui.widget.PriorityPreference
@@ -75,6 +79,7 @@
             android:defaultValue="@string/connection_priority_dnd_default"
             android:dependency="@string/connection_adjust_priority_key"
             android:title="@string/dnd"
+            android:inputType="numberSigned"
             android:singleLine="true"
             />
     </PreferenceCategory>