Merge branch 'next-gen' into develop

Conflicts:
	.gitignore
	app/build.gradle
	app/libs/otr4j.jar
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/xabber/android/data/Application.java
	app/src/main/java/com/xabber/android/data/account/AccountTable.java
	app/src/main/java/com/xabber/android/data/connection/ConnectionThread.java
	app/src/main/java/com/xabber/android/service/XabberService.java
	app/src/main/java/com/xabber/android/ui/ChatViewer.java
	app/src/main/java/com/xabber/android/ui/ContactList.java
	app/src/main/java/com/xabber/android/ui/adapter/AccountToggleAdapter.java
	app/src/main/java/com/xabber/android/ui/adapter/ChatViewerAdapter.java
	app/src/main/java/com/xabber/android/ui/adapter/OnTextChangedListener.java
	app/src/main/java/com/xabber/android/ui/dialog/AccountChooseDialogBuilder.java
	app/src/main/java/com/xabber/android/ui/dialog/ExportChatDialogBuilder.java
	app/src/main/java/com/xabber/android/ui/dialog/GroupAddDialogBuilder.java
	app/src/main/java/com/xabber/android/ui/dialog/GroupRenameDialogBuilder.java
	app/src/main/java/com/xabber/android/ui/helper/ManagedActivity.java
	app/src/main/java/com/xabber/android/ui/helper/ManagedListActivity.java
	app/src/main/res/drawable-hdpi-v4/account_background_1.png
	app/src/main/res/drawable-hdpi-v4/account_background_2.png
	app/src/main/res/drawable-hdpi-v4/account_background_3.png
	app/src/main/res/drawable-hdpi-v4/account_background_4.png
	app/src/main/res/drawable-hdpi-v4/account_border_1_normal.png
	app/src/main/res/drawable-hdpi-v4/account_border_1_pressed.png
	app/src/main/res/drawable-hdpi-v4/account_border_2_normal.png
	app/src/main/res/drawable-hdpi-v4/account_border_2_pressed.png
	app/src/main/res/drawable-hdpi-v4/account_border_3_normal.png
	app/src/main/res/drawable-hdpi-v4/account_border_3_pressed.png
	app/src/main/res/drawable-hdpi-v4/account_border_4_normal.png
	app/src/main/res/drawable-hdpi-v4/account_border_4_pressed.png
	app/src/main/res/drawable-hdpi-v4/account_border_disabled.png
	app/src/main/res/drawable-hdpi-v4/account_color_1.png
	app/src/main/res/drawable-hdpi-v4/account_color_2.png
	app/src/main/res/drawable-hdpi-v4/account_color_3.png
	app/src/main/res/drawable-hdpi-v4/account_color_4.png
	app/src/main/res/drawable-hdpi-v4/active_chat_focused.9.png
	app/src/main/res/drawable-hdpi-v4/active_chat_normal.9.png
	app/src/main/res/drawable-hdpi-v4/active_chat_pressed.9.png
	app/src/main/res/drawable-hdpi-v4/avatar_account_1.png
	app/src/main/res/drawable-hdpi-v4/avatar_account_2.png
	app/src/main/res/drawable-hdpi-v4/avatar_account_3.png
	app/src/main/res/drawable-hdpi-v4/avatar_account_4.png
	app/src/main/res/drawable-hdpi-v4/btn_status_mode_focused.9.png
	app/src/main/res/drawable-hdpi-v4/btn_status_mode_normal.9.png
	app/src/main/res/drawable-hdpi-v4/btn_status_mode_pressed.9.png
	app/src/main/res/drawable-hdpi-v4/btn_title_back_normal.png
	app/src/main/res/drawable-hdpi-v4/btn_title_back_pressed.png
	app/src/main/res/drawable-hdpi-v4/chat_bg_1.png
	app/src/main/res/drawable-hdpi-v4/chat_bg_2.png
	app/src/main/res/drawable-hdpi-v4/chat_bg_3.png
	app/src/main/res/drawable-hdpi-v4/chat_bg_4.png
	app/src/main/res/drawable-hdpi-v4/chat_border.9.png
	app/src/main/res/drawable-hdpi-v4/emo_im_angel.png
	app/src/main/res/drawable-hdpi-v4/emo_im_cool.png
	app/src/main/res/drawable-hdpi-v4/emo_im_crying.png
	app/src/main/res/drawable-hdpi-v4/emo_im_foot_in_mouth.png
	app/src/main/res/drawable-hdpi-v4/emo_im_happy.png
	app/src/main/res/drawable-hdpi-v4/emo_im_kissing.png
	app/src/main/res/drawable-hdpi-v4/emo_im_laughing.png
	app/src/main/res/drawable-hdpi-v4/emo_im_lips_are_sealed.png
	app/src/main/res/drawable-hdpi-v4/emo_im_money_mouth.png
	app/src/main/res/drawable-hdpi-v4/emo_im_sad.png
	app/src/main/res/drawable-hdpi-v4/emo_im_surprised.png
	app/src/main/res/drawable-hdpi-v4/emo_im_tongue_sticking_out.png
	app/src/main/res/drawable-hdpi-v4/emo_im_undecided.png
	app/src/main/res/drawable-hdpi-v4/emo_im_winking.png
	app/src/main/res/drawable-hdpi-v4/emo_im_wtf.png
	app/src/main/res/drawable-hdpi-v4/emo_im_yelling.png
	app/src/main/res/drawable-hdpi-v4/expander_account_1_dark_focused.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_1_dark_long.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_1_dark_normal.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_1_dark_pressed.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_1_light_focused.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_1_light_long.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_1_light_normal.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_1_light_pressed.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_2_dark_focused.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_2_dark_long.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_2_dark_normal.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_2_dark_pressed.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_2_light_focused.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_2_light_long.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_2_light_normal.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_2_light_pressed.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_3_dark_focused.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_3_dark_long.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_3_dark_normal.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_3_dark_pressed.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_3_light_focused.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_3_light_long.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_3_light_normal.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_3_light_pressed.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_4_dark_focused.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_4_dark_long.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_4_dark_normal.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_4_dark_pressed.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_4_light_focused.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_4_light_long.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_4_light_normal.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_4_light_pressed.9.png
	app/src/main/res/drawable-hdpi-v4/expander_group_dark_focused.9.png
	app/src/main/res/drawable-hdpi-v4/expander_group_dark_normal.9.png
	app/src/main/res/drawable-hdpi-v4/expander_group_dark_pressed.9.png
	app/src/main/res/drawable-hdpi-v4/expander_group_light_focused.9.png
	app/src/main/res/drawable-hdpi-v4/expander_group_light_normal.9.png
	app/src/main/res/drawable-hdpi-v4/expander_group_light_pressed.9.png
	app/src/main/res/drawable-hdpi-v4/expander_indicator_dark_hidden.png
	app/src/main/res/drawable-hdpi-v4/expander_indicator_dark_show.png
	app/src/main/res/drawable-hdpi-v4/expander_indicator_light_hidden.png
	app/src/main/res/drawable-hdpi-v4/expander_indicator_light_show.png
	app/src/main/res/drawable-hdpi-v4/ic_client_adium.png
	app/src/main/res/drawable-hdpi-v4/ic_client_empathy.png
	app/src/main/res/drawable-hdpi-v4/ic_client_gajim.png
	app/src/main/res/drawable-hdpi-v4/ic_client_gtalk.png
	app/src/main/res/drawable-hdpi-v4/ic_client_ichat.png
	app/src/main/res/drawable-hdpi-v4/ic_client_miranda.png
	app/src/main/res/drawable-hdpi-v4/ic_client_pidgin.png
	app/src/main/res/drawable-hdpi-v4/ic_client_psi.png
	app/src/main/res/drawable-hdpi-v4/ic_client_qip.png
	app/src/main/res/drawable-hdpi-v4/ic_client_vip.png
	app/src/main/res/drawable-hdpi-v4/ic_client_xabber.png
	app/src/main/res/drawable-hdpi-v4/ic_information.png
	app/src/main/res/drawable-hdpi-v4/ic_menu_allfriends.png
	app/src/main/res/drawable-hdpi-v4/ic_menu_archive.png
	app/src/main/res/drawable-hdpi-v4/ic_menu_blocked_user.png
	app/src/main/res/drawable-hdpi-v4/ic_menu_chat_dashboard.png
	app/src/main/res/drawable-hdpi-v4/ic_menu_end_conversation.png
	app/src/main/res/drawable-hdpi-v4/ic_menu_friendslist.png
	app/src/main/res/drawable-hdpi-v4/ic_menu_invite.png
	app/src/main/res/drawable-hdpi-v4/ic_menu_notifications.png
	app/src/main/res/drawable-hdpi-v4/ic_menu_stop.png
	app/src/main/res/drawable-hdpi-v4/ic_message_delivered.png
	app/src/main/res/drawable-hdpi-v4/ic_message_has_error.png
	app/src/main/res/drawable-hdpi-v4/ic_message_not_delivered.png
	app/src/main/res/drawable-hdpi-v4/ic_message_not_sent.png
	app/src/main/res/drawable-hdpi-v4/ic_security_encripted.png
	app/src/main/res/drawable-hdpi-v4/ic_security_finished.png
	app/src/main/res/drawable-hdpi-v4/ic_security_plain.png
	app/src/main/res/drawable-hdpi-v4/ic_security_verified.png
	app/src/main/res/drawable-hdpi-v4/ic_show_offline_always.9.png
	app/src/main/res/drawable-hdpi-v4/ic_show_offline_never.9.png
	app/src/main/res/drawable-hdpi-v4/ic_stat_attention.png
	app/src/main/res/drawable-hdpi-v4/ic_stat_auth_failed.png
	app/src/main/res/drawable-hdpi-v4/ic_stat_message.png
	app/src/main/res/drawable-hdpi-v4/ic_stat_message_offline.png
	app/src/main/res/drawable-hdpi-v4/ic_stat_normal.png
	app/src/main/res/drawable-hdpi-v4/ic_stat_offline.png
	app/src/main/res/drawable-hdpi-v4/ic_stat_play.png
	app/src/main/res/drawable-hdpi-v4/ic_stat_request.png
	app/src/main/res/drawable-hdpi-v4/ic_stat_subscribe.png
	app/src/main/res/drawable-hdpi-v4/ic_status_available.png
	app/src/main/res/drawable-hdpi-v4/ic_status_available_account.png
	app/src/main/res/drawable-hdpi-v4/ic_status_away.png
	app/src/main/res/drawable-hdpi-v4/ic_status_away_account.png
	app/src/main/res/drawable-hdpi-v4/ic_status_chat.png
	app/src/main/res/drawable-hdpi-v4/ic_status_chat_account.png
	app/src/main/res/drawable-hdpi-v4/ic_status_connection.png
	app/src/main/res/drawable-hdpi-v4/ic_status_connection_account.png
	app/src/main/res/drawable-hdpi-v4/ic_status_dnd.png
	app/src/main/res/drawable-hdpi-v4/ic_status_dnd_account.png
	app/src/main/res/drawable-hdpi-v4/ic_status_invisible.png
	app/src/main/res/drawable-hdpi-v4/ic_status_unavailable.png
	app/src/main/res/drawable-hdpi-v4/ic_status_unavailable_account.png
	app/src/main/res/drawable-hdpi-v4/ic_status_unsubscribed.png
	app/src/main/res/drawable-hdpi-v4/ic_status_xa.png
	app/src/main/res/drawable-hdpi-v4/ic_status_xa_account.png
	app/src/main/res/drawable-hdpi-v4/notify_panel_notification_icon_bg.png
	app/src/main/res/drawable-hdpi-v4/shadow.png
	app/src/main/res/drawable-hdpi-v4/title_account_background_1_dark.9.png
	app/src/main/res/drawable-hdpi-v4/title_account_background_1_light.9.png
	app/src/main/res/drawable-hdpi-v4/title_account_background_2_dark.9.png
	app/src/main/res/drawable-hdpi-v4/title_account_background_2_light.9.png
	app/src/main/res/drawable-hdpi-v4/title_account_background_3_dark.9.png
	app/src/main/res/drawable-hdpi-v4/title_account_background_3_light.9.png
	app/src/main/res/drawable-hdpi-v4/title_account_background_4_dark.9.png
	app/src/main/res/drawable-hdpi-v4/title_account_background_4_light.9.png
	app/src/main/res/drawable-hdpi-v4/title_logo.9.png
	app/src/main/res/drawable-hdpi-v4/title_main_background_dark.9.png
	app/src/main/res/drawable-hdpi-v4/title_main_background_light.9.png
	app/src/main/res/drawable-hdpi/account_background_1.png
	app/src/main/res/drawable-hdpi/account_background_2.png
	app/src/main/res/drawable-hdpi/account_background_3.png
	app/src/main/res/drawable-hdpi/account_background_4.png
	app/src/main/res/drawable-hdpi/account_border_1_normal.png
	app/src/main/res/drawable-hdpi/account_border_1_pressed.png
	app/src/main/res/drawable-hdpi/account_border_2_normal.png
	app/src/main/res/drawable-hdpi/account_border_2_pressed.png
	app/src/main/res/drawable-hdpi/account_border_3_normal.png
	app/src/main/res/drawable-hdpi/account_border_3_pressed.png
	app/src/main/res/drawable-hdpi/account_border_4_normal.png
	app/src/main/res/drawable-hdpi/account_border_4_pressed.png
	app/src/main/res/drawable-hdpi/account_border_disabled.png
	app/src/main/res/drawable-hdpi/account_color_1.png
	app/src/main/res/drawable-hdpi/account_color_2.png
	app/src/main/res/drawable-hdpi/account_color_3.png
	app/src/main/res/drawable-hdpi/account_color_4.png
	app/src/main/res/drawable-hdpi/active_chat_focused.9.png
	app/src/main/res/drawable-hdpi/active_chat_normal.9.png
	app/src/main/res/drawable-hdpi/active_chat_pressed.9.png
	app/src/main/res/drawable-hdpi/avatar_account_1.png
	app/src/main/res/drawable-hdpi/avatar_account_2.png
	app/src/main/res/drawable-hdpi/avatar_account_3.png
	app/src/main/res/drawable-hdpi/avatar_account_4.png
	app/src/main/res/drawable-hdpi/btn_status_mode_focused.9.png
	app/src/main/res/drawable-hdpi/btn_status_mode_normal.9.png
	app/src/main/res/drawable-hdpi/btn_status_mode_pressed.9.png
	app/src/main/res/drawable-hdpi/btn_title_back_normal.png
	app/src/main/res/drawable-hdpi/btn_title_back_pressed.png
	app/src/main/res/drawable-hdpi/chat_bg_1.png
	app/src/main/res/drawable-hdpi/chat_bg_2.png
	app/src/main/res/drawable-hdpi/chat_bg_3.png
	app/src/main/res/drawable-hdpi/chat_bg_4.png
	app/src/main/res/drawable-hdpi/chat_border.9.png
	app/src/main/res/drawable-hdpi/emo_im_angel.png
	app/src/main/res/drawable-hdpi/emo_im_cool.png
	app/src/main/res/drawable-hdpi/emo_im_crying.png
	app/src/main/res/drawable-hdpi/emo_im_foot_in_mouth.png
	app/src/main/res/drawable-hdpi/emo_im_happy.png
	app/src/main/res/drawable-hdpi/emo_im_kissing.png
	app/src/main/res/drawable-hdpi/emo_im_laughing.png
	app/src/main/res/drawable-hdpi/emo_im_lips_are_sealed.png
	app/src/main/res/drawable-hdpi/emo_im_money_mouth.png
	app/src/main/res/drawable-hdpi/emo_im_sad.png
	app/src/main/res/drawable-hdpi/emo_im_surprised.png
	app/src/main/res/drawable-hdpi/emo_im_tongue_sticking_out.png
	app/src/main/res/drawable-hdpi/emo_im_undecided.png
	app/src/main/res/drawable-hdpi/emo_im_winking.png
	app/src/main/res/drawable-hdpi/emo_im_wtf.png
	app/src/main/res/drawable-hdpi/emo_im_yelling.png
	app/src/main/res/drawable-hdpi/expander_account_1_dark_focused.9.png
	app/src/main/res/drawable-hdpi/expander_account_1_dark_long.9.png
	app/src/main/res/drawable-hdpi/expander_account_1_dark_normal.9.png
	app/src/main/res/drawable-hdpi/expander_account_1_dark_pressed.9.png
	app/src/main/res/drawable-hdpi/expander_account_1_light_focused.9.png
	app/src/main/res/drawable-hdpi/expander_account_1_light_long.9.png
	app/src/main/res/drawable-hdpi/expander_account_1_light_normal.9.png
	app/src/main/res/drawable-hdpi/expander_account_1_light_pressed.9.png
	app/src/main/res/drawable-hdpi/expander_account_2_dark_focused.9.png
	app/src/main/res/drawable-hdpi/expander_account_2_dark_long.9.png
	app/src/main/res/drawable-hdpi/expander_account_2_dark_normal.9.png
	app/src/main/res/drawable-hdpi/expander_account_2_dark_pressed.9.png
	app/src/main/res/drawable-hdpi/expander_account_2_light_focused.9.png
	app/src/main/res/drawable-hdpi/expander_account_2_light_long.9.png
	app/src/main/res/drawable-hdpi/expander_account_2_light_normal.9.png
	app/src/main/res/drawable-hdpi/expander_account_2_light_pressed.9.png
	app/src/main/res/drawable-hdpi/expander_account_3_dark_focused.9.png
	app/src/main/res/drawable-hdpi/expander_account_3_dark_long.9.png
	app/src/main/res/drawable-hdpi/expander_account_3_dark_normal.9.png
	app/src/main/res/drawable-hdpi/expander_account_3_dark_pressed.9.png
	app/src/main/res/drawable-hdpi/expander_account_3_light_focused.9.png
	app/src/main/res/drawable-hdpi/expander_account_3_light_long.9.png
	app/src/main/res/drawable-hdpi/expander_account_3_light_normal.9.png
	app/src/main/res/drawable-hdpi/expander_account_3_light_pressed.9.png
	app/src/main/res/drawable-hdpi/expander_account_4_dark_focused.9.png
	app/src/main/res/drawable-hdpi/expander_account_4_dark_long.9.png
	app/src/main/res/drawable-hdpi/expander_account_4_dark_normal.9.png
	app/src/main/res/drawable-hdpi/expander_account_4_dark_pressed.9.png
	app/src/main/res/drawable-hdpi/expander_account_4_light_focused.9.png
	app/src/main/res/drawable-hdpi/expander_account_4_light_long.9.png
	app/src/main/res/drawable-hdpi/expander_account_4_light_normal.9.png
	app/src/main/res/drawable-hdpi/expander_account_4_light_pressed.9.png
	app/src/main/res/drawable-hdpi/expander_group_dark_focused.9.png
	app/src/main/res/drawable-hdpi/expander_group_dark_normal.9.png
	app/src/main/res/drawable-hdpi/expander_group_dark_pressed.9.png
	app/src/main/res/drawable-hdpi/expander_group_light_focused.9.png
	app/src/main/res/drawable-hdpi/expander_group_light_normal.9.png
	app/src/main/res/drawable-hdpi/expander_group_light_pressed.9.png
	app/src/main/res/drawable-hdpi/expander_indicator_dark_hidden.png
	app/src/main/res/drawable-hdpi/expander_indicator_dark_show.png
	app/src/main/res/drawable-hdpi/expander_indicator_light_hidden.png
	app/src/main/res/drawable-hdpi/expander_indicator_light_show.png
	app/src/main/res/drawable-hdpi/ic_client_adium.png
	app/src/main/res/drawable-hdpi/ic_client_empathy.png
	app/src/main/res/drawable-hdpi/ic_client_gajim.png
	app/src/main/res/drawable-hdpi/ic_client_gtalk.png
	app/src/main/res/drawable-hdpi/ic_client_ichat.png
	app/src/main/res/drawable-hdpi/ic_client_miranda.png
	app/src/main/res/drawable-hdpi/ic_client_pidgin.png
	app/src/main/res/drawable-hdpi/ic_client_psi.png
	app/src/main/res/drawable-hdpi/ic_client_qip.png
	app/src/main/res/drawable-hdpi/ic_client_vip.png
	app/src/main/res/drawable-hdpi/ic_client_xabber.png
	app/src/main/res/drawable-hdpi/ic_connect.png
	app/src/main/res/drawable-hdpi/ic_disconnect.png
	app/src/main/res/drawable-hdpi/ic_information.png
	app/src/main/res/drawable-hdpi/ic_launcher.png
	app/src/main/res/drawable-hdpi/ic_menu_allfriends.png
	app/src/main/res/drawable-hdpi/ic_menu_archive.png
	app/src/main/res/drawable-hdpi/ic_menu_blocked_user.png
	app/src/main/res/drawable-hdpi/ic_menu_chat_dashboard.png
	app/src/main/res/drawable-hdpi/ic_menu_end_conversation.png
	app/src/main/res/drawable-hdpi/ic_menu_friendslist.png
	app/src/main/res/drawable-hdpi/ic_menu_invite.png
	app/src/main/res/drawable-hdpi/ic_menu_notifications.png
	app/src/main/res/drawable-hdpi/ic_menu_stop.png
	app/src/main/res/drawable-hdpi/ic_message_delivered.png
	app/src/main/res/drawable-hdpi/ic_message_has_error.png
	app/src/main/res/drawable-hdpi/ic_message_not_delivered.png
	app/src/main/res/drawable-hdpi/ic_message_not_sent.png
	app/src/main/res/drawable-hdpi/ic_security_encripted.png
	app/src/main/res/drawable-hdpi/ic_security_finished.png
	app/src/main/res/drawable-hdpi/ic_security_plain.png
	app/src/main/res/drawable-hdpi/ic_security_verified.png
	app/src/main/res/drawable-hdpi/ic_show_offline_always.9.png
	app/src/main/res/drawable-hdpi/ic_show_offline_never.9.png
	app/src/main/res/drawable-hdpi/ic_stat_attention.png
	app/src/main/res/drawable-hdpi/ic_stat_auth_failed.png
	app/src/main/res/drawable-hdpi/ic_stat_message.png
	app/src/main/res/drawable-hdpi/ic_stat_message_offline.png
	app/src/main/res/drawable-hdpi/ic_stat_normal.png
	app/src/main/res/drawable-hdpi/ic_stat_offline.png
	app/src/main/res/drawable-hdpi/ic_stat_play.png
	app/src/main/res/drawable-hdpi/ic_stat_request.png
	app/src/main/res/drawable-hdpi/ic_stat_subscribe.png
	app/src/main/res/drawable-hdpi/ic_status_available.png
	app/src/main/res/drawable-hdpi/ic_status_available_account.png
	app/src/main/res/drawable-hdpi/ic_status_away.png
	app/src/main/res/drawable-hdpi/ic_status_away_account.png
	app/src/main/res/drawable-hdpi/ic_status_chat.png
	app/src/main/res/drawable-hdpi/ic_status_chat_account.png
	app/src/main/res/drawable-hdpi/ic_status_connection.png
	app/src/main/res/drawable-hdpi/ic_status_connection_account.png
	app/src/main/res/drawable-hdpi/ic_status_dnd.png
	app/src/main/res/drawable-hdpi/ic_status_dnd_account.png
	app/src/main/res/drawable-hdpi/ic_status_invisible.png
	app/src/main/res/drawable-hdpi/ic_status_unavailable.png
	app/src/main/res/drawable-hdpi/ic_status_unavailable_account.png
	app/src/main/res/drawable-hdpi/ic_status_unsubscribed.png
	app/src/main/res/drawable-hdpi/ic_status_xa.png
	app/src/main/res/drawable-hdpi/ic_status_xa_account.png
	app/src/main/res/drawable-hdpi/notify_panel_notification_icon_bg.png
	app/src/main/res/drawable-hdpi/shadow.png
	app/src/main/res/drawable-hdpi/title_account_background_1_dark.9.png
	app/src/main/res/drawable-hdpi/title_account_background_1_light.9.png
	app/src/main/res/drawable-hdpi/title_account_background_2_dark.9.png
	app/src/main/res/drawable-hdpi/title_account_background_2_light.9.png
	app/src/main/res/drawable-hdpi/title_account_background_3_dark.9.png
	app/src/main/res/drawable-hdpi/title_account_background_3_light.9.png
	app/src/main/res/drawable-hdpi/title_account_background_4_dark.9.png
	app/src/main/res/drawable-hdpi/title_account_background_4_light.9.png
	app/src/main/res/drawable-hdpi/title_logo.9.png
	app/src/main/res/drawable-hdpi/title_main_background_dark.9.png
	app/src/main/res/drawable-hdpi/title_main_background_light.9.png
	app/src/main/res/drawable-xhdpi-v4/notify_panel_notification_icon_bg.png
	app/src/main/res/drawable-xhdpi/notify_panel_notification_icon_bg.png
	app/src/main/res/drawable/btn_status_mode.xml
	app/src/main/res/drawable/ic_connect.png
	app/src/main/res/drawable/ic_disconnect.png
	app/src/main/res/drawable/ic_launcher.png
	app/src/main/res/layout-v5/base_contact_avatar.xml
	app/src/main/res/layout-v5/contact_title_avatar.xml
	app/src/main/res/layout/base_contact_avatar.xml
	app/src/main/res/layout/chat_viewer_container.xml
	app/src/main/res/layout/contact_list.xml
	app/src/main/res/layout/contact_title_avatar.xml
	app/src/main/res/values-es/about_viewer.xml
	app/src/main/res/values-es/account_editor.xml
	app/src/main/res/values-es/account_list.xml
	app/src/main/res/values-es/chat_viewer.xml
	app/src/main/res/values-es/contact_editor.xml
	app/src/main/res/values-es/contact_list.xml
	app/src/main/res/values-es/contact_viewer.xml
	app/src/main/res/values-es/fingerprint_viewer.xml
	app/src/main/res/values-es/market.xml
	app/src/main/res/values-es/muc_editor.xml
	app/src/main/res/values-es/notification_bar.xml
	app/src/main/res/values-es/preference_editor.xml
	app/src/main/res/values-es/secret_viewer.xml
	app/src/main/res/values-es/status_editor.xml
	app/src/main/res/values-es/words.xml
	app/src/main/res/values-fr/about_viewer.xml
	app/src/main/res/values-fr/account_editor.xml
	app/src/main/res/values-fr/account_list.xml
	app/src/main/res/values-fr/change_log.xml
	app/src/main/res/values-fr/chat_viewer.xml
	app/src/main/res/values-fr/contact_editor.xml
	app/src/main/res/values-fr/contact_list.xml
	app/src/main/res/values-fr/contact_viewer.xml
	app/src/main/res/values-fr/fingerprint_viewer.xml
	app/src/main/res/values-fr/muc_editor.xml
	app/src/main/res/values-fr/notification_bar.xml
	app/src/main/res/values-fr/preference_editor.xml
	app/src/main/res/values-fr/secret_viewer.xml
	app/src/main/res/values-fr/status_editor.xml
	app/src/main/res/values-fr/words.xml
	app/src/main/res/values-it/about_viewer.xml
	app/src/main/res/values-it/contact_list.xml
	app/src/main/res/values-it/words.xml
	app/src/main/res/values-ja/account_list.xml
	app/src/main/res/values-ja/contact_list.xml
	app/src/main/res/values-ja/secret_viewer.xml
	app/src/main/res/values-ja/status_editor.xml
	app/src/main/res/values-ja/words.xml
	app/src/main/res/values-nl/about_viewer.xml
	app/src/main/res/values-nl/account_editor.xml
	app/src/main/res/values-nl/account_list.xml
	app/src/main/res/values-nl/chat_viewer.xml
	app/src/main/res/values-nl/contact_editor.xml
	app/src/main/res/values-nl/contact_list.xml
	app/src/main/res/values-nl/contact_viewer.xml
	app/src/main/res/values-nl/fingerprint_viewer.xml
	app/src/main/res/values-nl/market.xml
	app/src/main/res/values-nl/muc_editor.xml
	app/src/main/res/values-nl/notification_bar.xml
	app/src/main/res/values-nl/preference_editor.xml
	app/src/main/res/values-nl/secret_viewer.xml
	app/src/main/res/values-nl/status_editor.xml
	app/src/main/res/values-nl/words.xml
	app/src/main/res/values-ru/chat_viewer.xml
	app/src/main/res/values-ru/phrase_editor.xml
	app/src/main/res/values-sk/about_viewer.xml
	app/src/main/res/values-sk/account_editor.xml
	app/src/main/res/values-sk/account_list.xml
	app/src/main/res/values-sk/change_log.xml
	app/src/main/res/values-sk/chat_viewer.xml
	app/src/main/res/values-sk/contact_editor.xml
	app/src/main/res/values-sk/contact_list.xml
	app/src/main/res/values-sk/contact_viewer.xml
	app/src/main/res/values-sk/fingerprint_viewer.xml
	app/src/main/res/values-sk/market.xml
	app/src/main/res/values-sk/muc_editor.xml
	app/src/main/res/values-sk/notification_bar.xml
	app/src/main/res/values-sk/preference_editor.xml
	app/src/main/res/values-sk/secret_viewer.xml
	app/src/main/res/values-sk/status_editor.xml
	app/src/main/res/values-sk/words.xml
	app/src/main/res/values-sv-rSE/about_viewer.xml
	app/src/main/res/values-sv-rSE/account_list.xml
	app/src/main/res/values-sv-rSE/contact_editor.xml
	app/src/main/res/values-sv-rSE/contact_viewer.xml
	app/src/main/res/values-sv-rSE/muc_editor.xml
	app/src/main/res/values-sv-rSE/notification_bar.xml
	app/src/main/res/values-sv-rSE/status_editor.xml
	app/src/main/res/values-sv-rSE/words.xml
	app/src/main/res/values-zh-rCN/account_editor.xml
	app/src/main/res/values-zh-rCN/account_list.xml
	app/src/main/res/values-zh-rCN/contact_editor.xml
	app/src/main/res/values-zh-rCN/contact_viewer.xml
	app/src/main/res/values-zh-rCN/secret_viewer.xml
	app/src/main/res/values-zh-rCN/status_editor.xml
	app/src/main/res/values-zh-rTW/chat_viewer.xml
	app/src/main/res/values-zh-rTW/contact_editor.xml
	app/src/main/res/values-zh-rTW/secret_viewer.xml
	app/src/main/res/values/connections.xml
	app/src/main/res/values/phrase_editor.xml
	app/src/main/res/values/versions.xml
	gradlew.bat
	res/drawable-hdpi-v4/account_background_1.png
	res/drawable-hdpi-v4/account_background_2.png
	res/drawable-hdpi-v4/account_background_3.png
	res/drawable-hdpi-v4/account_background_4.png
	res/drawable-hdpi-v4/account_border_1_normal.png
	res/drawable-hdpi-v4/account_border_1_pressed.png
	res/drawable-hdpi-v4/account_border_2_normal.png
	res/drawable-hdpi-v4/account_border_2_pressed.png
	res/drawable-hdpi-v4/account_border_3_normal.png
	res/drawable-hdpi-v4/account_border_3_pressed.png
	res/drawable-hdpi-v4/account_border_4_normal.png
	res/drawable-hdpi-v4/account_border_4_pressed.png
	res/drawable-hdpi-v4/account_border_disabled.png
	res/drawable-hdpi-v4/account_color_1.png
	res/drawable-hdpi-v4/account_color_2.png
	res/drawable-hdpi-v4/account_color_3.png
	res/drawable-hdpi-v4/account_color_4.png
	res/drawable-hdpi-v4/active_chat_focused.9.png
	res/drawable-hdpi-v4/active_chat_normal.9.png
	res/drawable-hdpi-v4/active_chat_pressed.9.png
	res/drawable-hdpi-v4/avatar_account_1.png
	res/drawable-hdpi-v4/avatar_account_2.png
	res/drawable-hdpi-v4/avatar_account_3.png
	res/drawable-hdpi-v4/avatar_account_4.png
	res/drawable-hdpi-v4/btn_status_mode_focused.9.png
	res/drawable-hdpi-v4/btn_status_mode_normal.9.png
	res/drawable-hdpi-v4/btn_status_mode_pressed.9.png
	res/drawable-hdpi-v4/btn_title_back_normal.png
	res/drawable-hdpi-v4/btn_title_back_pressed.png
	res/drawable-hdpi-v4/chat_bg_1.png
	res/drawable-hdpi-v4/chat_bg_2.png
	res/drawable-hdpi-v4/chat_bg_3.png
	res/drawable-hdpi-v4/chat_bg_4.png
	res/drawable-hdpi-v4/chat_border.9.png
	res/drawable-hdpi-v4/emo_im_angel.png
	res/drawable-hdpi-v4/emo_im_cool.png
	res/drawable-hdpi-v4/emo_im_crying.png
	res/drawable-hdpi-v4/emo_im_foot_in_mouth.png
	res/drawable-hdpi-v4/emo_im_happy.png
	res/drawable-hdpi-v4/emo_im_kissing.png
	res/drawable-hdpi-v4/emo_im_laughing.png
	res/drawable-hdpi-v4/emo_im_lips_are_sealed.png
	res/drawable-hdpi-v4/emo_im_money_mouth.png
	res/drawable-hdpi-v4/emo_im_sad.png
	res/drawable-hdpi-v4/emo_im_surprised.png
	res/drawable-hdpi-v4/emo_im_tongue_sticking_out.png
	res/drawable-hdpi-v4/emo_im_undecided.png
	res/drawable-hdpi-v4/emo_im_winking.png
	res/drawable-hdpi-v4/emo_im_wtf.png
	res/drawable-hdpi-v4/emo_im_yelling.png
	res/drawable-hdpi-v4/expander_account_1_dark_focused.9.png
	res/drawable-hdpi-v4/expander_account_1_dark_long.9.png
	res/drawable-hdpi-v4/expander_account_1_dark_normal.9.png
	res/drawable-hdpi-v4/expander_account_1_dark_pressed.9.png
	res/drawable-hdpi-v4/expander_account_1_light_focused.9.png
	res/drawable-hdpi-v4/expander_account_1_light_long.9.png
	res/drawable-hdpi-v4/expander_account_1_light_normal.9.png
	res/drawable-hdpi-v4/expander_account_1_light_pressed.9.png
	res/drawable-hdpi-v4/expander_account_2_dark_focused.9.png
	res/drawable-hdpi-v4/expander_account_2_dark_long.9.png
	res/drawable-hdpi-v4/expander_account_2_dark_normal.9.png
	res/drawable-hdpi-v4/expander_account_2_dark_pressed.9.png
	res/drawable-hdpi-v4/expander_account_2_light_focused.9.png
	res/drawable-hdpi-v4/expander_account_2_light_long.9.png
	res/drawable-hdpi-v4/expander_account_2_light_normal.9.png
	res/drawable-hdpi-v4/expander_account_2_light_pressed.9.png
	res/drawable-hdpi-v4/expander_account_3_dark_focused.9.png
	res/drawable-hdpi-v4/expander_account_3_dark_long.9.png
	res/drawable-hdpi-v4/expander_account_3_dark_normal.9.png
	res/drawable-hdpi-v4/expander_account_3_dark_pressed.9.png
	res/drawable-hdpi-v4/expander_account_3_light_focused.9.png
	res/drawable-hdpi-v4/expander_account_3_light_long.9.png
	res/drawable-hdpi-v4/expander_account_3_light_normal.9.png
	res/drawable-hdpi-v4/expander_account_3_light_pressed.9.png
	res/drawable-hdpi-v4/expander_account_4_dark_focused.9.png
	res/drawable-hdpi-v4/expander_account_4_dark_long.9.png
	res/drawable-hdpi-v4/expander_account_4_dark_normal.9.png
	res/drawable-hdpi-v4/expander_account_4_dark_pressed.9.png
	res/drawable-hdpi-v4/expander_account_4_light_focused.9.png
	res/drawable-hdpi-v4/expander_account_4_light_long.9.png
	res/drawable-hdpi-v4/expander_account_4_light_normal.9.png
	res/drawable-hdpi-v4/expander_account_4_light_pressed.9.png
	res/drawable-hdpi-v4/expander_group_dark_focused.9.png
	res/drawable-hdpi-v4/expander_group_dark_normal.9.png
	res/drawable-hdpi-v4/expander_group_dark_pressed.9.png
	res/drawable-hdpi-v4/expander_group_light_focused.9.png
	res/drawable-hdpi-v4/expander_group_light_normal.9.png
	res/drawable-hdpi-v4/expander_group_light_pressed.9.png
	res/drawable-hdpi-v4/expander_indicator_dark_hidden.png
	res/drawable-hdpi-v4/expander_indicator_dark_show.png
	res/drawable-hdpi-v4/expander_indicator_light_hidden.png
	res/drawable-hdpi-v4/expander_indicator_light_show.png
	res/drawable-hdpi-v4/ic_client_adium.png
	res/drawable-hdpi-v4/ic_client_empathy.png
	res/drawable-hdpi-v4/ic_client_gajim.png
	res/drawable-hdpi-v4/ic_client_gtalk.png
	res/drawable-hdpi-v4/ic_client_ichat.png
	res/drawable-hdpi-v4/ic_client_miranda.png
	res/drawable-hdpi-v4/ic_client_pidgin.png
	res/drawable-hdpi-v4/ic_client_psi.png
	res/drawable-hdpi-v4/ic_client_qip.png
	res/drawable-hdpi-v4/ic_client_vip.png
	res/drawable-hdpi-v4/ic_client_xabber.png
	res/drawable-hdpi-v4/ic_information.png
	res/drawable-hdpi-v4/ic_menu_allfriends.png
	res/drawable-hdpi-v4/ic_menu_archive.png
	res/drawable-hdpi-v4/ic_menu_blocked_user.png
	res/drawable-hdpi-v4/ic_menu_chat_dashboard.png
	res/drawable-hdpi-v4/ic_menu_end_conversation.png
	res/drawable-hdpi-v4/ic_menu_friendslist.png
	res/drawable-hdpi-v4/ic_menu_invite.png
	res/drawable-hdpi-v4/ic_menu_notifications.png
	res/drawable-hdpi-v4/ic_menu_stop.png
	res/drawable-hdpi-v4/ic_message_delivered.png
	res/drawable-hdpi-v4/ic_message_has_error.png
	res/drawable-hdpi-v4/ic_message_not_delivered.png
	res/drawable-hdpi-v4/ic_message_not_sent.png
	res/drawable-hdpi-v4/ic_security_encripted.png
	res/drawable-hdpi-v4/ic_security_finished.png
	res/drawable-hdpi-v4/ic_security_plain.png
	res/drawable-hdpi-v4/ic_security_verified.png
	res/drawable-hdpi-v4/ic_show_offline_always.9.png
	res/drawable-hdpi-v4/ic_show_offline_never.9.png
	res/drawable-hdpi-v4/ic_stat_attention.png
	res/drawable-hdpi-v4/ic_stat_auth_failed.png
	res/drawable-hdpi-v4/ic_stat_message.png
	res/drawable-hdpi-v4/ic_stat_message_offline.png
	res/drawable-hdpi-v4/ic_stat_normal.png
	res/drawable-hdpi-v4/ic_stat_offline.png
	res/drawable-hdpi-v4/ic_stat_play.png
	res/drawable-hdpi-v4/ic_stat_request.png
	res/drawable-hdpi-v4/ic_stat_subscribe.png
	res/drawable-hdpi-v4/ic_status_available.png
	res/drawable-hdpi-v4/ic_status_available_account.png
	res/drawable-hdpi-v4/ic_status_away.png
	res/drawable-hdpi-v4/ic_status_away_account.png
	res/drawable-hdpi-v4/ic_status_chat.png
	res/drawable-hdpi-v4/ic_status_chat_account.png
	res/drawable-hdpi-v4/ic_status_connection.png
	res/drawable-hdpi-v4/ic_status_connection_account.png
	res/drawable-hdpi-v4/ic_status_dnd.png
	res/drawable-hdpi-v4/ic_status_dnd_account.png
	res/drawable-hdpi-v4/ic_status_invisible.png
	res/drawable-hdpi-v4/ic_status_unavailable.png
	res/drawable-hdpi-v4/ic_status_unavailable_account.png
	res/drawable-hdpi-v4/ic_status_unsubscribed.png
	res/drawable-hdpi-v4/ic_status_xa.png
	res/drawable-hdpi-v4/ic_status_xa_account.png
	res/drawable-hdpi-v4/notify_panel_notification_icon_bg.png
	res/drawable-hdpi-v4/shadow.png
	res/drawable-hdpi-v4/title_account_background_1_dark.9.png
	res/drawable-hdpi-v4/title_account_background_1_light.9.png
	res/drawable-hdpi-v4/title_account_background_2_dark.9.png
	res/drawable-hdpi-v4/title_account_background_2_light.9.png
	res/drawable-hdpi-v4/title_account_background_3_dark.9.png
	res/drawable-hdpi-v4/title_account_background_3_light.9.png
	res/drawable-hdpi-v4/title_account_background_4_dark.9.png
	res/drawable-hdpi-v4/title_account_background_4_light.9.png
	res/drawable-hdpi-v4/title_logo.9.png
	res/drawable-hdpi-v4/title_main_background_dark.9.png
	res/drawable-hdpi-v4/title_main_background_light.9.png
	res/drawable-xhdpi-v4/notify_panel_notification_icon_bg.png
	res/layout-v5/contact_title_avatar.xml
	res/layout/contact_title_avatar.xml

app/build.gradle

 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 9
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 21
+    buildToolsVersion "21.1.1"
 
     defaultConfig {
         applicationId "com.xabber.androiddev"
-        minSdkVersion 3
-        targetSdkVersion 9
+        minSdkVersion 7
+        targetSdkVersion 21
     }
 
     buildTypes {
@@ -20,4 +20,5 @@ android {
 
 dependencies {
     compile files('libs/otr4j.jar')
+    compile 'com.android.support:support-v4:21.0.3'
 }

app/src/main/AndroidManifest.xml

@@ -19,6 +19,7 @@
     android:installLocation="auto"
     >
     <application
+        android:debuggable="true"
         android:label="@string/application_name"
         android:icon="@drawable/ic_launcher"
         android:name="com.xabber.android.data.Application"
@@ -169,6 +170,12 @@
             android:name="com.xabber.android.ui.OpenSourceViewer"
             android:theme="@style/Theme.NoTitleBar"
             />
+        <activity
+            android:name="com.xabber.android.ui.ContactSubscription"
+            />
+        <activity
+            android:name="com.xabber.android.ui.MUCInvite"
+            />
         <activity
             android:name="com.xabber.android.ui.CertificateConfirmation"
             />
@@ -234,7 +241,7 @@
         <receiver android:name="com.xabber.android.receiver.GoXaReceiver" />
         <receiver android:name="com.xabber.android.receiver.ComposingPausedReceiver" />
     </application>
-    <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="9" />
+    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="16"/>
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
     <uses-feature android:name="android.hardware.location" android:required="false" />
     <uses-feature android:name="android.hardware.location.gps" android:required="false" />

app/src/main/java/com/xabber/android/data/account/AccountManager.java

@@ -28,6 +28,7 @@ import org.jivesoftware.smack.util.StringUtils;
 
 import android.content.res.TypedArray;
 import android.database.Cursor;
+import android.os.Build;
 
 import com.xabber.android.data.Application;
 import com.xabber.android.data.NetworkException;
@@ -134,7 +135,7 @@ public class AccountManager implements OnLoadListener, OnWipeListener {
 			TypedArray values = application.getResources().obtainTypedArray(id);
 			AccountProtocol protocol = AccountProtocol.valueOf(values
 					.getString(0));
-			if (Application.SDK_INT < 8 && protocol == AccountProtocol.wlm) {
+			if (Build.VERSION.SDK_INT < 8 && protocol == AccountProtocol.wlm) {
 				values.recycle();
 				continue;
 			}

app/src/main/java/com/xabber/android/data/connection/ConnectionThread.java

@@ -14,6 +14,8 @@
  */
 package com.xabber.android.data.connection;
 
+import android.os.Build;
+
 import java.net.InetAddress;
 import java.security.cert.CertificateException;
 import java.util.concurrent.ExecutorService;
@@ -282,7 +284,7 @@ public class ConnectionThread implements
 				proxyUser, proxyPassword);
 		ConnectionConfiguration connectionConfiguration = new ConnectionConfiguration(
 				address.getHostAddress(), port, serverName, proxy);
-		if (Application.SDK_INT >= 14) {
+		if (Build.VERSION.SDK_INT >= 14) {
 			connectionConfiguration.setTruststoreType("AndroidCAStore");
 			connectionConfiguration.setTruststorePassword(null);
 			connectionConfiguration.setTruststorePath(null);

app/src/main/java/com/xabber/android/data/notification/NotificationManager.java

@@ -392,7 +392,8 @@ public class NotificationManager implements OnInitializedListener,
 			chatViews.setTextViewText(R.id.text, status);
 
 			Notification notification = new Notification();
-			if (Application.SDK_INT >= 14 && SettingsManager.eventsPersistent()) {
+			if (Build.VERSION.SDK_INT >= 14
+					&& SettingsManager.eventsPersistent()) {
 				// Ongoing icons are in the left side, so hide this one.
 				notification.icon = R.drawable.ic_placeholder;
 				notification.when = Long.MIN_VALUE;
@@ -430,7 +431,7 @@ public class NotificationManager implements OnInitializedListener,
 		persistentNotification.defaults = 0;
 		persistentNotification.sound = null;
 		persistentNotification.tickerText = null;
-		if (Application.SDK_INT >= 14 && SettingsManager.eventsPersistent()) {
+		if (Build.VERSION.SDK_INT >= 14 && SettingsManager.eventsPersistent()) {
 			// Ongoing icons are in the left side, so always use it.
 			persistentNotification.when = startTime;
 			if (messageNotifications.isEmpty()) {
@@ -451,7 +452,7 @@ public class NotificationManager implements OnInitializedListener,
 				updateNotification(persistentNotification, ticker);
 			} else {
 				persistentNotification.icon = R.drawable.ic_placeholder;
-				persistentNotification.when = Application.SDK_INT >= 9 ? -Long.MAX_VALUE
+				persistentNotification.when = Build.VERSION.SDK_INT >= 9 ? -Long.MAX_VALUE
 						: Long.MAX_VALUE;
 			}
 		}

app/src/main/res/layout-v5/base_contact_avatar.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
-
-     This file is part of Xabber project; you can redistribute it and/or
-     modify it under the terms of the GNU General Public License, Version 3.
-
-     Xabber is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-     See the GNU General Public License for more details.
-
-     You should have received a copy of the GNU General Public License,
-     along with this program. If not, see http://www.gnu.org/licenses/.
--->
-<QuickContactBadge
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/avatar"
-    android:layout_width="@dimen/avatar_size"
-    android:layout_height="@dimen/avatar_size"
-    android:layout_toRightOf="@id/color"
-    android:src="@drawable/avatar_1_1"
-    />

app/src/main/res/layout/about_viewer.xml

@@ -15,15 +15,15 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:gravity="center_horizontal"
     android:padding="4dip"
     >
     <LinearLayout
         android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_weight="1"
         android:gravity="center">
         <ImageView

app/src/main/res/layout/account_add.xml

@@ -15,17 +15,17 @@
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
     <LinearLayout
         android:orientation="vertical"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <TextView android:text="@string/account_type" android:layout_width="fill_parent" android:layout_height="wrap_content" />
+        <TextView android:text="@string/account_type" android:layout_width="match_parent" android:layout_height="wrap_content" />
         <Spinner
             android:id="@+id/account_type"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingTop="4dip"
             android:paddingBottom="8dip"
@@ -34,15 +34,15 @@
 
         <LinearLayout
             android:id="@+id/auth_panel"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             >
 
-            <TextView android:text="@string/account_user_name" android:layout_width="fill_parent" android:layout_height="wrap_content" />
+            <TextView android:text="@string/account_user_name" android:layout_width="match_parent" android:layout_height="wrap_content" />
             <EditText
             	android:id="@+id/account_user_name"
-            	android:layout_width="fill_parent"
+                android:layout_width="match_parent"
             	android:layout_height="wrap_content"
             	android:inputType="textEmailAddress"
             	android:singleLine="true"
@@ -50,10 +50,10 @@
             	android:hint=""
            	/>
     
-            <TextView android:text="@string/account_password" android:layout_width="fill_parent" android:layout_height="wrap_content" />
+            <TextView android:text="@string/account_password" android:layout_width="match_parent" android:layout_height="wrap_content" />
             <EditText
             	android:id="@+id/account_password"
-            	android:layout_width="fill_parent"
+                android:layout_width="match_parent"
             	android:layout_height="wrap_content"
             	android:password="true"
             	android:singleLine="true"
@@ -62,7 +62,7 @@
 
             <CheckBox
                 android:id="@+id/store_password"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:checked="true"
                 android:text="@string/account_store_password" />
@@ -71,7 +71,7 @@
 
         <CheckBox
             android:id="@+id/syncable"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:checked="true"
             android:text="@string/account_syncable" />
@@ -85,20 +85,20 @@
 
         <LinearLayout
             android:orientation="horizontal"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content">
             <Button
                 android:text="@string/account_add"
                 android:id="@+id/ok"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
             />
         </LinearLayout>
 
         <TextView 
             android:id="@+id/account_help"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:autoLink="all"
         />
     </LinearLayout>

app/src/main/res/layout/account_choose_dropdown.xml

@@ -14,7 +14,7 @@
 -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="4dip">
 
@@ -27,8 +27,8 @@
 
     <TextView
         android:id="@+id/name"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_marginLeft="6dip"
         android:singleLine="true"
         android:ellipsize="marquee"

app/src/main/res/layout/account_choose_item.xml

@@ -14,7 +14,7 @@
 -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="4dip">
 
@@ -27,8 +27,8 @@
 
     <TextView
         android:id="@+id/name"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_marginLeft="6dip"
         android:singleLine="true"
         android:ellipsize="marquee"

app/src/main/res/layout/account_list_item.xml

@@ -14,7 +14,7 @@
 -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="@dimen/contact_list_item_height"
     android:paddingTop="@dimen/contact_list_item_padding_top"
     android:paddingBottom="@dimen/contact_list_item_padding_bottom"
@@ -34,14 +34,14 @@
     <LinearLayout
         android:orientation="vertical"
         android:layout_weight="1"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:paddingLeft="4dip"
         android:paddingRight="4dip"
         >
         <TextView
             android:id="@+id/name"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:singleLine="true"
@@ -54,7 +54,7 @@
         <TextView
             android:id="@+id/status"
             android:text="@android:string/cancel"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:singleLine="true"

app/src/main/res/layout/account_type_dropdown.xml

@@ -14,7 +14,7 @@
 -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="4dip">
 
@@ -27,8 +27,8 @@
 
     <TextView
         android:id="@+id/name"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_marginLeft="6dip"
         android:singleLine="true"
         android:ellipsize="marquee"

app/src/main/res/layout/account_type_item.xml

@@ -14,7 +14,7 @@
 -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="2dip">
     
@@ -27,8 +27,8 @@
 
     <TextView
         android:id="@+id/name"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_marginLeft="6dip"
         android:singleLine="true"
         android:ellipsize="marquee"

app/src/main/res/layout/add_item.xml

@@ -14,13 +14,13 @@
 -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="4dip">
 
     <TextView
         android:id="@android:id/message"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="48dp"
         android:singleLine="true"
         android:ellipsize="marquee"

app/src/main/res/layout/base_contact_avatar.xml

@@ -12,7 +12,7 @@
      You should have received a copy of the GNU General Public License,
      along with this program. If not, see http://www.gnu.org/licenses/.
 -->
-<ImageView
+<QuickContactBadge
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/avatar"
     android:layout_width="@dimen/avatar_size"

app/src/main/res/layout/base_contact_item.xml

@@ -14,7 +14,7 @@
 -->
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="@dimen/contact_list_item_height"
     android:paddingTop="@dimen/contact_list_item_padding_top"
     android:paddingBottom="@dimen/contact_list_item_padding_bottom"
@@ -28,8 +28,8 @@
     <include layout="@layout/base_contact_avatar" />
     <RelativeLayout
         android:id="@+id/panel"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:paddingLeft="@dimen/active_chat_padding_left"
         android:paddingTop="@dimen/active_chat_padding_top"
         android:paddingRight="@dimen/active_chat_padding_right"
@@ -47,7 +47,7 @@
             />
         <TextView
             android:id="@+id/name"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="@dimen/contact_name_height_show_status"
             android:layout_marginRight="@dimen/status_icon_width"
             android:gravity="bottom"
@@ -59,7 +59,7 @@
             />
         <TextView
             android:id="@+id/status"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="@dimen/contact_name_height_show_status"
             android:layout_marginRight="@dimen/status_icon_width"
             android:gravity="top"
@@ -81,7 +81,7 @@
     </RelativeLayout>
 	<ImageView
 	    android:id="@+id/shadow"
-	    android:layout_width="fill_parent"
+	    android:layout_width="match_parent"
 	    android:layout_height="@dimen/contact_list_item_height"
 	    android:background="@drawable/shadow"
 	    />

app/src/main/res/layout/base_group_item.xml

@@ -14,7 +14,7 @@
 -->
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="@dimen/expander_height"
     android:gravity="center_vertical|left"
     android:background="@drawable/expander_background_dark"
@@ -29,7 +29,7 @@
         />
     <TextView
         android:id="@+id/name"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="@dimen/expander_height"
         android:gravity="center_vertical"
         android:layout_marginRight="@dimen/expander_text_margin_right"

app/src/main/res/layout/chat_list_item.xml

@@ -14,7 +14,7 @@
 -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingLeft="6dip"
     android:paddingTop="4dip"
@@ -34,7 +34,7 @@
     <include layout="@layout/base_contact_avatar" />
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dip"
         android:orientation="vertical"

app/src/main/res/layout/chat_notification.xml

@@ -14,7 +14,7 @@
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="3dp">
     <ImageView

app/src/main/res/layout/chat_viewer.xml

@@ -14,7 +14,7 @@
 -->
 <com.xabber.android.ui.widget.PageSwitcher
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:id="@+id/switcher"
     />
\ No newline at end of file

app/src/main/res/layout-v5/contact_title_avatar.xml → app/src/main/res/layout/chat_viewer_container.xml

@@ -12,10 +12,10 @@
      You should have received a copy of the GNU General Public License,
      along with this program. If not, see http://www.gnu.org/licenses/.
 -->
-<QuickContactBadge
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/avatar"
-    android:layout_width="36dip"
-    android:layout_height="36dip"
-    android:src="@drawable/avatar_1_1"
+    android:id="@+id/container"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     />

app/src/main/res/layout/chat_viewer_empty.xml

@@ -15,6 +15,6 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="1px"
     />
\ No newline at end of file

app/src/main/res/layout/chat_viewer_info.xml

@@ -15,11 +15,11 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
     <TextView
         android:id="@+id/info"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="4dip"
         android:textAppearance="@style/ChatInfo.Warning"

app/src/main/res/layout/chat_viewer_item.xml

@@ -15,19 +15,19 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     >
     <include layout="@layout/contact_title" />
     <RelativeLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         >
         <ListView
             android:id="@android:id/list"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:layout_weight="1"
             android:padding="4dip"
             android:stackFromBottom="true"
@@ -36,7 +36,7 @@
             />
         <TextView
             android:id="@+id/chat_page"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="4dip"
             android:textSize="12sp"
@@ -48,7 +48,7 @@
     </RelativeLayout>
     <LinearLayout
         android:orientation="horizontal"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="4dip">
         <EditText
@@ -59,7 +59,7 @@
             android:cursorVisible="true"
             android:hint="@string/chat_input_hint"
             android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:maxLines="5"
             android:scrollbars="vertical"
             android:fadingEdge="vertical"
@@ -68,7 +68,7 @@
             android:text="@string/chat_send"
             android:id="@+id/chat_send"
             android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             />
     </LinearLayout>
 </LinearLayout>

app/src/main/res/layout/chat_viewer_message.xml

@@ -15,7 +15,7 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/background"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingRight="4dip"
     android:paddingBottom="4dip"

app/src/main/res/layout/contact_add.xml

@@ -15,6 +15,6 @@
 <ListView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/list"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:padding="4dip" />

app/src/main/res/layout/contact_add_header.xml

@@ -15,8 +15,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:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:paddingRight="4dip"
     >
 
@@ -27,7 +27,7 @@
         />
     <com.xabber.android.ui.widget.NoDefaultSpinner
         android:id="@+id/contact_account"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:prompt="@string/choose_account"
         />
@@ -40,7 +40,7 @@
     <EditText
         android:text=""
         android:id="@+id/contact_user"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="user@domain.name"
         android:singleLine="true"
@@ -55,7 +55,7 @@
     <EditText
         android:text=""
         android:id="@+id/contact_name"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:singleLine="true"
         />
@@ -63,13 +63,13 @@
     <LinearLayout
         android:orientation="horizontal"
         android:gravity="center_horizontal|bottom"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         >
         <Button
             android:text="@string/contact_add"
             android:id="@+id/ok"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             />
     </LinearLayout>

app/src/main/res/layout/contact_editor.xml

@@ -15,8 +15,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:layout_width="match_parent"
+    android:layout_height="match_parent"
     >
 
     <include layout="@layout/contact_title" />
@@ -33,7 +33,7 @@
 
     <EditText
         android:id="@+id/contact_name"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         />
 
@@ -49,7 +49,7 @@
 
     <ListView
         android:id="@android:id/list"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:paddingLeft="6dip"

app/src/main/res/layout/contact_list.xml

 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
+<!--
+     Copyright (c) 2013, Redsolution LTD. All rights reserved.
 
      This file is part of Xabber project; you can redistribute it and/or
      modify it under the terms of the GNU General Public License, Version 3.
@@ -12,47 +13,47 @@
      You should have received a copy of the GNU General Public License,
      along with this program. If not, see http://www.gnu.org/licenses/.
 -->
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
     <RelativeLayout
         android:id="@android:id/title"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="@dimen/title_height"
-        android:background="@drawable/title_main_background_dark"
-        >
+        android:layout_alignParentTop="true"
+        android:background="@drawable/title_main_background_dark" >
+
         <ImageButton
             android:id="@+id/back_button"
-	        android:background="@drawable/title_logo"
             android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:layout_alignParentLeft="true"
-            />
+            android:background="@drawable/title_logo"
+            tools:ignore="ContentDescription" />
+
         <LinearLayout
-	        android:orientation="horizontal"
             android:layout_width="wrap_content"
-	        android:layout_height="fill_parent"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
             android:layout_marginRight="@dimen/contact_list_status_mode_width"
             android:layout_toRightOf="@id/back_button"
-            android:layout_alignParentRight="true"
-	        >
+            android:orientation="horizontal" >
+
             <HorizontalScrollView
                 android:id="@+id/account_bar"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-	            android:layout_marginRight="72dip"
-	            >
+                android:layout_marginRight="72dip" >
+
                 <LinearLayout
                     android:id="@+id/account_list"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-	                android:orientation="horizontal"
-	                >
-<!--
+                    android:orientation="horizontal" >
+
+                    <!--
 <RelativeLayout 
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/account_bg"
@@ -98,77 +99,41 @@
     />
 </RelativeLayout>
                     -->
+
                 </LinearLayout>
+
             </HorizontalScrollView>
+
             <TextView
                 android:id="@+id/common_status_text"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="left"
                 android:layout_marginLeft="-72dip"
-                android:textColor="?android:attr/textColorPrimary"
-                android:text="online"
+                android:gravity="left|center_vertical"
                 android:padding="2dip"
                 android:singleLine="true"
-                android:gravity="left|center_vertical"
-                android:layout_gravity="left"
-                />
+                android:text="online"
+                android:textColor="?android:attr/textColorPrimary" />
+
         </LinearLayout>
+
         <ImageButton
             android:id="@+id/common_status_mode"
-            android:src="@drawable/ic_status"
-            android:paddingLeft="@dimen/active_chat_padding_right"
-            android:paddingRight="@dimen/active_chat_padding_right"
-            android:background="@drawable/btn_status_mode"
             android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:layout_alignParentRight="true"
-            />
+            android:background="@drawable/btn_status_mode"
+            android:paddingLeft="@dimen/active_chat_padding_right"
+            android:paddingRight="@dimen/active_chat_padding_right"
+            android:src="@drawable/ic_status" />
+
     </RelativeLayout>
-    <ListView
-        android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textFilterEnabled="true"
-		/>
+
     <RelativeLayout
-        android:id="@+id/info"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_weight="1"
-        android:gravity="center_vertical"
-        >
-        <ImageView
-            android:id="@+id/connected"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:src="@drawable/ic_connect"
-            />
-        <ImageView
-            android:id="@+id/disconnected"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:src="@drawable/ic_disconnect"
-            />
-        <TextView
-            android:id="@+id/text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="?android:attr/textColorSecondary"
-            android:layout_below="@id/connected"
-            android:layout_centerHorizontal="true"
-            android:text="@string/application_state_starting"
-            />
-        <Button 
-            android:id="@+id/button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="20dip"
-            android:layout_below="@id/text" 
-            android:visibility="gone"
-            android:text="@string/application_action_waiting"
-            />
-    </RelativeLayout>
-</LinearLayout>
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@android:id/title" />
+
+</RelativeLayout>
\ No newline at end of file

app/src/main/res/layout/contact_list_fragment.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (c) 2013, Redsolution LTD. All rights reserved.
+
+     This file is part of Xabber project; you can redistribute it and/or
+     modify it under the terms of the GNU General Public License, Version 3.
+
+     Xabber is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+     See the GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License,
+     along with this program. If not, see http://www.gnu.org/licenses/.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:textFilterEnabled="true" />
+
+    <RelativeLayout
+        android:id="@+id/info"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical" >
+
+        <ImageView
+            android:id="@+id/connected"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:src="@drawable/ic_connect"
+            tools:ignore="ContentDescription" />
+
+        <ImageView
+            android:id="@+id/disconnected"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:src="@drawable/ic_disconnect"
+            tools:ignore="ContentDescription" />
+
+        <TextView
+            android:id="@+id/text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/connected"
+            android:layout_centerHorizontal="true"
+            android:text="@string/application_state_starting"
+            android:textColor="?android:attr/textColorSecondary" />
+
+        <Button
+            android:id="@+id/button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/text"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="20dip"
+            android:text="@string/application_action_waiting" />
+
+    </RelativeLayout>
+
+</RelativeLayout>

app/src/main/res/layout/contact_title.xml

@@ -15,14 +15,14 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/title"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="@dimen/title_height"
     android:background="@drawable/title_account_background_light"
     >
     <LinearLayout
         android:id="@+id/title_color"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
         >
         <ImageButton
@@ -30,7 +30,7 @@
             android:src="@drawable/btn_title_back"
             android:background="@drawable/title_logo"
             android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             />
         <LinearLayout
             android:layout_width="wrap_content"
@@ -45,13 +45,13 @@
             android:src="@drawable/ic_security"
             android:paddingLeft="6dip"
             android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:visibility="gone"
             />
         <LinearLayout
             android:id="@+id/name_holder"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:orientation="vertical"
             android:layout_weight="1"
             android:layout_gravity="center_vertical"
@@ -59,7 +59,7 @@
             >
             <TextView
                 android:id="@+id/name"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="bottom"
@@ -71,7 +71,7 @@
                 />
             <TextView
                 android:id="@+id/status_text"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="top"
@@ -88,13 +88,13 @@
             android:paddingRight="@dimen/active_chat_padding_right"
             android:background="@drawable/btn_status_mode"
             android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             />
     </LinearLayout>
     <ImageView
         android:id="@+id/shadow"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:background="@drawable/shadow"
         />
 </RelativeLayout>

app/src/main/res/layout/contact_title_avatar.xml

@@ -12,7 +12,7 @@
      You should have received a copy of the GNU General Public License,
      along with this program. If not, see http://www.gnu.org/licenses/.
 -->
-<ImageView
+<QuickContactBadge
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/avatar"
     android:layout_width="36dip"

app/src/main/res/layout/dialog.xml

@@ -13,8 +13,8 @@
      along with this program. If not, see http://www.gnu.org/licenses/.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:orientation="vertical"
     android:paddingTop="9dip"
     android:paddingBottom="3dip"
@@ -23,14 +23,14 @@
     >
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="54dip"
         android:orientation="vertical"
         >
 
         <LinearLayout
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:gravity="center_vertical"
@@ -55,14 +55,14 @@
                 style="?android:attr/textAppearanceLarge"
                 android:singleLine="true"
                 android:ellipsize="end"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
 				/>
 
         </LinearLayout>
 
         <ImageView
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="1dip"
             android:visibility="gone"
             android:scaleType="fitXY"
@@ -73,7 +73,7 @@
 
     <ScrollView
         android:id="@+id/container"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:paddingTop="2dip"
@@ -84,14 +84,14 @@
         >
 
         <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:orientation="vertical" >
 
             <TextView
                 android:id="@android:id/message"
                 style="?android:attr/textAppearanceMedium"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
 				android:padding="5dip"
 				/>
@@ -101,14 +101,14 @@
     </ScrollView>
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         >
 
 	    <FrameLayout
 	        android:id="@android:id/custom"
-	        android:layout_width="fill_parent"
+	        android:layout_width="match_parent"
 	        android:layout_height="wrap_content"
 	        android:paddingTop="5dip"
 	        android:paddingBottom="5dip"
@@ -116,7 +116,7 @@
 
         <LinearLayout
             style="@android:style/ButtonBar"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:paddingTop="4dip"

app/src/main/res/layout/export_chat.xml

@@ -16,17 +16,17 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:padding="4dp"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     >
     <EditText
         android:id="@+id/name"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         />
     <CheckBox
         android:id="@+id/send"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textColor="?android:attr/textColorPrimaryInverse"
         android:text="@string/export_chat_send"

app/src/main/res/layout/fingerprint_viewer.xml

@@ -15,21 +15,21 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     >
 
     <include layout="@layout/contact_title" />
 
 	<ScrollView
-	    android:layout_width="fill_parent"
-	    android:layout_height="fill_parent"
+	    android:layout_width="match_parent"
+	    android:layout_height="match_parent"
 	    >
 
 		<LinearLayout
 		    android:orientation="vertical"
-		    android:layout_width="fill_parent"
-		    android:layout_height="fill_parent"
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
 		    android:paddingTop="8dip"
 		    android:paddingBottom="4dip"
 		    android:paddingLeft="2dip"
@@ -38,20 +38,20 @@
 
 		    <TextView
 		        android:text="@string/otr_fingerprint_description"
-		        android:layout_width="fill_parent"
+		        android:layout_width="match_parent"
 		        android:layout_height="wrap_content"
 		        android:paddingBottom="8dip"
 		        />
 
 		    <TextView
 		        android:text="@string/otr_remote_fingerprint"
-		        android:layout_width="fill_parent"
+		        android:layout_width="match_parent"
 		        android:layout_height="wrap_content"
 		        />
 
 		    <TextView
 		        android:id="@+id/otr_remote_fingerprint"
-		        android:layout_width="fill_parent"
+		        android:layout_width="match_parent"
 		        android:layout_height="wrap_content"
 		        style="@android:style/TextAppearance.Large"
 		        android:text="12:34:56"
@@ -59,33 +59,33 @@
 
 		    <CheckBox
 		        android:id="@+id/verified"
-		        android:layout_width="fill_parent"
+		        android:layout_width="match_parent"
 		        android:layout_height="wrap_content"
 		        android:text="@string/otr_is_verified"
 		        />
 
 		    <Button
 		        android:id="@+id/scan"
-		        android:layout_width="fill_parent"
+		        android:layout_width="match_parent"
 		        android:layout_height="wrap_content"
 		        android:text="@string/otr_scan_fingerprint"
 		        />
 
 		    <ImageView
-		        android:layout_width="fill_parent"
+		        android:layout_width="match_parent"
 		        android:layout_height="wrap_content"
 		        android:background="@android:drawable/divider_horizontal_dark"
 		        />
 
 		    <TextView
 		        android:text="@string/otr_local_fingerprint"
-		        android:layout_width="fill_parent"
+		        android:layout_width="match_parent"
 		        android:layout_height="wrap_content"
 		        />
 
 		    <TextView
 		        android:id="@+id/otr_local_fingerprint"
-		        android:layout_width="fill_parent"
+		        android:layout_width="match_parent"
 		        android:layout_height="wrap_content"
 		        style="@android:style/TextAppearance.Large"
 		        android:text="12:34:56"
@@ -93,14 +93,14 @@
 
 		    <Button
 		        android:id="@+id/show"
-		        android:layout_width="fill_parent"
+		        android:layout_width="match_parent"
 		        android:layout_height="wrap_content"
 		        android:text="@string/otr_show_fingerprint"
 		        />
 
 		    <Button
 		        android:id="@+id/copy"
-		        android:layout_width="fill_parent"
+		        android:layout_width="match_parent"
 		        android:layout_height="wrap_content"
 		        android:text="@string/otr_copy_fingerprint"
 		        />

app/src/main/res/layout/group_name.xml

@@ -16,7 +16,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:padding="4dp"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <TextView
@@ -27,7 +27,7 @@
 
     <EditText
         android:id="@+id/group_name"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         />
 

app/src/main/res/layout/info_preference.xml

@@ -18,7 +18,7 @@
      Preference is able to place a specific widget for its particular
      type in the "widget_frame" layout. -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
@@ -52,7 +52,7 @@
     <!-- Preference should place its actual preference widget here. -->
     <LinearLayout android:id="@+android:id/widget_frame"
         android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:gravity="center_vertical"
         android:orientation="vertical" />
 

app/src/main/res/layout/list.xml

@@ -15,6 +15,6 @@
 <ListView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/list"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     />

app/src/main/res/layout/load.xml

@@ -14,8 +14,8 @@
 -->
 <RelativeLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:layout_weight="1"
     android:gravity="center_vertical"
     >

app/src/main/res/layout/muc_editor.xml

@@ -15,14 +15,14 @@
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     >
 
     <LinearLayout
         android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         >
 
         <TextView
@@ -32,7 +32,7 @@
             />
         <com.xabber.android.ui.widget.NoDefaultSpinner
             android:id="@+id/contact_account"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:prompt="@string/choose_account"
             />
@@ -44,7 +44,7 @@
             />
         <EditText
             android:id="@+id/muc_server"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/muc_server_hint"
             android:singleLine="true"
@@ -58,7 +58,7 @@
             />
         <EditText
             android:id="@+id/muc_room"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:singleLine="true"
             />
@@ -70,7 +70,7 @@
             />
         <EditText
             android:id="@+id/muc_nick"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:hint="@string/muc_nick_hint"
@@ -78,12 +78,12 @@
 
         <TextView
             android:text="@string/muc_password"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             />
         <EditText
             android:id="@+id/muc_password"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:password="true"
             android:singleLine="true"
@@ -94,21 +94,21 @@
             android:id="@+id/muc_join"
             android:checked="true"
             android:text="@string/muc_join"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             />
         
         <LinearLayout
             android:orientation="horizontal"
             android:gravity="center_horizontal|bottom"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             >
 
             <Button
                 android:text="@string/muc_save"
                 android:id="@+id/ok"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 />
 

app/src/main/res/layout/oauth.xml

@@ -25,7 +25,7 @@
         />
     <WebView
         android:id="@+id/webview"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         />
 </FrameLayout>
\ No newline at end of file

app/src/main/res/layout/occupant_list_item.xml

@@ -14,7 +14,7 @@
 -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="@dimen/contact_list_item_height"
     android:paddingLeft="6dip"
     android:paddingRight="6dip"
@@ -42,13 +42,13 @@
         />
 
     <RelativeLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dip"
         >
         <TextView
             android:id="@+id/name"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="@dimen/contact_name_height_show_status"
             android:layout_marginRight="@dimen/status_icon_width"
             android:gravity="bottom"
@@ -60,7 +60,7 @@
             />
         <TextView
             android:id="@+id/status"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="@dimen/contact_name_height_show_status"
             android:layout_marginRight="@dimen/status_icon_width"
             android:gravity="top"

app/src/main/res/layout/password_request.xml

@@ -14,18 +14,18 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <TextView
         android:text="@string/account_password"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         />
 
     <EditText
         android:id="@+id/account_password"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:password="true"
         android:singleLine="true"
@@ -33,7 +33,7 @@
 
     <CheckBox
         android:id="@+id/store_password"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:checked="false"
         android:text="@string/account_store_password"

app/src/main/res/layout/preference.xml

@@ -18,7 +18,7 @@
      Preference is able to place a specific widget for its particular
      type in the "widget_frame" layout. -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:minHeight="?android:attr/listPreferredItemHeight"
@@ -54,7 +54,7 @@
     <!-- Preference should place its actual preference widget here. -->
     <LinearLayout android:id="@+android:id/widget_frame"
         android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:gravity="center_vertical"
         android:orientation="vertical" />
 

app/src/main/res/layout/progress_preference.xml

@@ -18,7 +18,7 @@
      Preference is able to place a specific widget for its particular
      type in the "widget_frame" layout. -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:minHeight="?android:attr/listPreferredItemHeight"
@@ -44,7 +44,7 @@
             style="?android:attr/progressBarStyleHorizontal"
         	android:minHeight="10dip"
         	android:maxHeight="10dip"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@android:id/title"
             android:layout_alignLeft="@android:id/title"
@@ -68,7 +68,7 @@
     <!-- Preference should place its actual preference widget here. -->
     <LinearLayout android:id="@+android:id/widget_frame"
         android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:gravity="center_vertical"
         android:orientation="vertical" />
 

app/src/main/res/layout/question_viewer.xml

@@ -15,16 +15,16 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     >
 
     <include layout="@layout/contact_title" />
 
 	<ScrollView
 	    android:orientation="vertical"
-	    android:layout_width="fill_parent"
-	    android:layout_height="fill_parent"
+	    android:layout_width="match_parent"
+	    android:layout_height="match_parent"
 	    android:paddingTop="8dip"
 	    android:paddingBottom="4dip"
 	    android:paddingLeft="2dip"
@@ -33,50 +33,50 @@
 
 		<LinearLayout
 		    android:orientation="vertical"
-		    android:layout_width="fill_parent"
-		    android:layout_height="fill_parent"
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
 		    >
 
 		    <TextView
 		        android:text="@string/otr_question_description"
-		        android:layout_width="fill_parent"
+		        android:layout_width="match_parent"
 		        android:layout_height="wrap_content"
 		        android:paddingBottom="8dip"
 		        />
 
 		    <TextView
 		        android:text="@string/otr_question"
-		        android:layout_width="fill_parent"
+		        android:layout_width="match_parent"
 		        android:layout_height="wrap_content"
 		        />
 
 		    <EditText
 		        android:id="@+id/question"
-		        android:layout_width="fill_parent"
+		        android:layout_width="match_parent"
 		        android:layout_height="wrap_content"
 		        />
 
 		    <TextView
 		        android:text="@string/otr_answer"
-		        android:layout_width="fill_parent"
+		        android:layout_width="match_parent"
 		        android:layout_height="wrap_content"
 		        />
 
 		    <EditText
 		        android:id="@+id/answer"
-		        android:layout_width="fill_parent"
+		        android:layout_width="match_parent"
 		        android:layout_height="wrap_content"
 		        />
 
 			<LinearLayout
 			    android:orientation="horizontal"
-			    android:layout_width="fill_parent"
-			    android:layout_height="fill_parent"
+			    android:layout_width="match_parent"
+			    android:layout_height="match_parent"
 			    >
 
 			    <Button
 			        android:id="@+id/send"
-			        android:layout_width="fill_parent"
+			        android:layout_width="match_parent"
 			        android:layout_height="wrap_content"
 			        android:layout_weight="1"
 			        android:text="@string/chat_send"
@@ -84,7 +84,7 @@
 
 			    <Button
 			        android:id="@+id/cancel"
-			        android:layout_width="fill_parent"
+			        android:layout_width="match_parent"
 			        android:layout_height="wrap_content"
 			        android:layout_weight="1"
 			        android:text="@android:string/cancel"

app/src/main/res/layout/secret_viewer.xml

@@ -15,16 +15,16 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     >
 
     <include layout="@layout/contact_title" />
 
 	<ScrollView
 	    android:orientation="vertical"
-	    android:layout_width="fill_parent"
-	    android:layout_height="fill_parent"
+	    android:layout_width="match_parent"
+	    android:layout_height="match_parent"
 	    android:paddingTop="8dip"
 	    android:paddingBottom="4dip"
 	    android:paddingLeft="2dip"
@@ -33,38 +33,38 @@
 
 		<LinearLayout
 		    android:orientation="vertical"
-		    android:layout_width="fill_parent"
-		    android:layout_height="fill_parent"
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
 		    >
 
 		    <TextView
 		        android:text="@string/otr_secret_description"
-		        android:layout_width="fill_parent"
+		        android:layout_width="match_parent"
 		        android:layout_height="wrap_content"
 		        android:paddingBottom="8dip"
 		        />
 
 			<TextView
 		        android:text="@string/otr_secret"
-		        android:layout_width="fill_parent"
+		        android:layout_width="match_parent"
 		        android:layout_height="wrap_content"
 		        />
 
 		    <EditText
 		        android:id="@+id/answer"
-		        android:layout_width="fill_parent"
+		        android:layout_width="match_parent"
 		        android:layout_height="wrap_content"
 		        />
 
 			<LinearLayout
 			    android:orientation="horizontal"
-			    android:layout_width="fill_parent"
-			    android:layout_height="fill_parent"
+			    android:layout_width="match_parent"
+			    android:layout_height="match_parent"
 			    >
 
 			    <Button
 			        android:id="@+id/send"
-			        android:layout_width="fill_parent"
+			        android:layout_width="match_parent"
 			        android:layout_height="wrap_content"
 			        android:layout_weight="1"
 			        android:text="@string/chat_send"
@@ -72,7 +72,7 @@
 
 			    <Button
 			        android:id="@+id/cancel"
-			        android:layout_width="fill_parent"
+			        android:layout_width="match_parent"
 			        android:layout_height="wrap_content"
 			        android:layout_weight="1"
 			        android:text="@android:string/cancel"

app/src/main/res/layout/status_editor.xml

@@ -15,6 +15,6 @@
 <ListView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/list"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:padding="4dip" />

app/src/main/res/layout/status_editor_header.xml

@@ -15,23 +15,23 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
     <Spinner
 		android:id="@+id/status_mode"
 		android:prompt="@string/status_editor"
-	    android:layout_width="fill_parent"
+	    android:layout_width="match_parent"
 	    android:layout_height="wrap_content"
 	    />
 	<EditText
 		android:id="@+id/status_text"
-	    android:layout_width="fill_parent"
+	    android:layout_width="match_parent"
 	    android:layout_height="wrap_content"
 	    android:hint="@string/status_text_hint"
 	    />
     <Button
         android:id="@+id/ok"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/status_editor"
 		/>

app/src/main/res/layout/status_editor_item.xml

@@ -14,7 +14,7 @@
 -->
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:padding="4dip">
@@ -25,7 +25,7 @@
 		android:src="@drawable/ic_status" />
     <TextView
         android:id="@+id/name"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
     	android:layout_height="42dip"
         android:layout_marginLeft="6dip"
         android:singleLine="true"

app/src/main/res/layout/status_mode_dropdown.xml

@@ -14,7 +14,7 @@
 -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:padding="4dip">
@@ -29,7 +29,7 @@
 
     <TextView
         android:id="@+id/name"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="42dip"
         android:layout_marginLeft="6dip"
         android:singleLine="true"

app/src/main/res/layout/status_mode_item.xml

@@ -14,7 +14,7 @@
 -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:padding="4dip">
@@ -28,7 +28,7 @@
 
     <TextView
         android:id="@+id/name"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="6dip"
         android:singleLine="true"

app/src/main/res/values/phrase_editor.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- https://dl.dropboxusercontent.com/u/1029995/com.xabber.android/preference_editor_notifications_phrases.png -->
     <string name="events_phrases_title">Key phrases</string>
-    <!-- https://dl.dropboxusercontent.com/u/1029995/com.xabber.android/preference_editor_notifications_phrases.png -->
     <string name="phrase_add">Add phrase</string>
-    <!-- https://dl.dropboxusercontent.com/u/1029995/com.xabber.android/preference_editor_notifications_phrases_remove.png -->
     <string name="phrase_delete">Delete phrase</string>
-    <!-- https://dl.dropboxusercontent.com/u/1029995/com.xabber.android/preference_editor_notifications_phrases_remove.png -->
-    <string name="phrase_delete_confirm">Do you really want to delete phrase: %s?</string>
-    <!-- https://dl.dropboxusercontent.com/u/1029995/com.xabber.android/preference_editor_notifications_phrases.png -->
+    <string name="phrase_delete_confirm">Do you realy want to delete phrase: %s?</string>
     <string name="phrase_empty">&lt; Any text &gt;</string>
-    <!-- https://dl.dropboxusercontent.com/u/1029995/com.xabber.android/preference_editor_notifications_phrases_detail.png -->
     <string name="phrase_group">Part of the contact group</string>
-    <!-- https://dl.dropboxusercontent.com/u/1029995/com.xabber.android/preference_editor_notifications_phrases_detail.png -->
     <string name="phrase_regexp">Regular expression</string>
-    <!-- https://dl.dropboxusercontent.com/u/1029995/com.xabber.android/preference_editor_notifications_phrases_detail.png -->
     <string name="phrase_sound">Sound\nChoose notification sound</string>
-    <!-- https://dl.dropboxusercontent.com/u/1029995/com.xabber.android/preference_editor_notifications_phrases_detail.png -->
     <string name="phrase_text">Text to search for</string>
-    <!-- https://dl.dropboxusercontent.com/u/1029995/com.xabber.android/preference_editor_notifications_phrases_detail.png -->
     <string name="phrase_user">Contact\'s Jabber ID part</string>
 </resources>
\ No newline at end of file

gradlew.bat

+<<<<<<< HEAD
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem