equal
  deleted
  inserted
  replaced
  
    
    
    99 			android:hint="@string/login_username_info_default"  | 
    99 			android:hint="@string/login_username_info_default"  | 
   100 			android:inputType="textEmailAddress" />  | 
   100 			android:inputType="textEmailAddress" />  | 
   101 		<EditTextPreference  | 
   101 		<EditTextPreference  | 
   102 			android:name="password"  | 
   102 			android:name="password"  | 
   103 			android:singleLine="true"  | 
   103 			android:singleLine="true"  | 
   104 			android:password="true"  | 
   104 			android:inputType="textPassword"  | 
   105 			android:summary="@string/SettingsPassword"  | 
   105 			android:summary="@string/SettingsPassword"  | 
   106 			android:title="@string/settings_account_password"  | 
   106 			android:title="@string/settings_account_password"  | 
   107 			android:key="account_password" />  | 
   107 			android:key="account_password" />  | 
   108 	</PreferenceCategory>  | 
   108 	</PreferenceCategory>  | 
   109 	<PreferenceCategory  | 
   109 	<PreferenceCategory  | 
   115 			android:defaultValue="Beem" />  | 
   115 			android:defaultValue="Beem" />  | 
   116 		<EditTextPreference  | 
   116 		<EditTextPreference  | 
   117 			android:key="settings_key_priority"  | 
   117 			android:key="settings_key_priority"  | 
   118 			android:title="@string/SettingsPriorityTitle"  | 
   118 			android:title="@string/SettingsPriorityTitle"  | 
   119 			android:summary="@string/SettingsPrioritySummary"  | 
   119 			android:summary="@string/SettingsPrioritySummary"  | 
   120 			android:numeric="signed"  | 
   120 			android:inputType="numberSigned"  | 
   121 			android:defaultValue="0" />  | 
   121 			android:defaultValue="0" />  | 
   122 	</PreferenceCategory>  | 
   122 	</PreferenceCategory>  | 
   123 	<PreferenceCategory  | 
   123 	<PreferenceCategory  | 
   124 		android:title="@string/network_preferences">  | 
   124 		android:title="@string/network_preferences">  | 
   125 		<PreferenceScreen  | 
   125 		<PreferenceScreen  | 
   153 					android:dependency="proxy_use"  | 
   153 					android:dependency="proxy_use"  | 
   154 					android:name="port"  | 
   154 					android:name="port"  | 
   155 					android:summary="@string/SettingsProxyPort"  | 
   155 					android:summary="@string/SettingsProxyPort"  | 
   156 					android:title="@string/settings_proxy_port"  | 
   156 					android:title="@string/settings_proxy_port"  | 
   157 					android:key="proxy_port"  | 
   157 					android:key="proxy_port"  | 
   158 					android:numeric="signed"  | 
   158 					android:inputType="numberSigned"  | 
   159 					android:hint="@string/comments_proxy_port" />  | 
   159 					android:hint="@string/comments_proxy_port" />  | 
   160 			</PreferenceCategory>  | 
   160 			</PreferenceCategory>  | 
   161 			<PreferenceCategory  | 
   161 			<PreferenceCategory  | 
   162 				android:title="@string/proxy_user_settings">  | 
   162 				android:title="@string/proxy_user_settings">  | 
   163 				<EditTextPreference  | 
   163 				<EditTextPreference  | 
   169 					android:key="proxy_username" />  | 
   169 					android:key="proxy_username" />  | 
   170 				<EditTextPreference  | 
   170 				<EditTextPreference  | 
   171 					android:singleLine="true"  | 
   171 					android:singleLine="true"  | 
   172 					android:dependency="proxy_use"  | 
   172 					android:dependency="proxy_use"  | 
   173 					android:name="pass_user"  | 
   173 					android:name="pass_user"  | 
   174 					android:password="true"  | 
   174 					android:inputType="textPassword"  | 
   175 					android:summary="@string/SettingsProxyPassword"  | 
   175 					android:summary="@string/SettingsProxyPassword"  | 
   176 					android:title="@string/settings_proxy_password"  | 
   176 					android:title="@string/settings_proxy_password"  | 
   177 					android:key="proxy_password" />  | 
   177 					android:key="proxy_password" />  | 
   178 			</PreferenceCategory>  | 
   178 			</PreferenceCategory>  | 
   179 		</PreferenceScreen>  | 
   179 		</PreferenceScreen>  | 
   217 				android:dependency="settings_key_specific_server"  | 
   217 				android:dependency="settings_key_specific_server"  | 
   218 				android:name="port"  | 
   218 				android:name="port"  | 
   219 				android:summary="@string/SettingsAdvancedPortOpt"  | 
   219 				android:summary="@string/SettingsAdvancedPortOpt"  | 
   220 				android:title="@string/settings_xmpp_port"  | 
   220 				android:title="@string/settings_xmpp_port"  | 
   221 				android:defaultValue="5222"  | 
   221 				android:defaultValue="5222"  | 
   222 				android:numeric="signed"  | 
   222 				android:inputType="numberSigned"  | 
   223 				android:key="settings_key_xmpp_port"  | 
   223 				android:key="settings_key_xmpp_port"  | 
   224 				android:hint="@string/comments_xmpp_port" />  | 
   224 				android:hint="@string/comments_xmpp_port" />  | 
   225 			<CheckBoxPreference  | 
   225 			<CheckBoxPreference  | 
   226 				android:title="@string/settings_full_jid_login"  | 
   226 				android:title="@string/settings_full_jid_login"  | 
   227 				android:defaultValue="false"  | 
   227 				android:defaultValue="false"  |