| commit | dc65cda708b8a31c20e6a405ace0775ad4ebad27 | [log] [tgz] |
|---|---|---|
| author | Walter Jang <wjang@google.com> | Sun Aug 14 15:45:52 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sun Aug 14 15:45:52 2016 +0000 |
| tree | ac86ae0ca655686e73d3840af8e2b500dacb07ef | |
| parent | acb6f4d3d53cd35d9a8e5877fd2e18c4395ef25f [diff] | |
| parent | 44e39122aa02cab770e52bc94959dde9508e45b3 [diff] |
Merge "Move res-common files to res where destination file doesn't exist" into ub-contactsdialer-g-dev
diff --git a/res-common/color/popup_menu_color.xml b/res/color/popup_menu_color.xml similarity index 100% rename from res-common/color/popup_menu_color.xml rename to res/color/popup_menu_color.xml
diff --git a/res-common/color/tab_text_color.xml b/res/color/tab_text_color.xml similarity index 100% rename from res-common/color/tab_text_color.xml rename to res/color/tab_text_color.xml
diff --git a/res-common/drawable-hdpi/ic_ab_search.png b/res/drawable-hdpi/ic_ab_search.png similarity index 100% rename from res-common/drawable-hdpi/ic_ab_search.png rename to res/drawable-hdpi/ic_ab_search.png Binary files differ
diff --git a/res-common/drawable-hdpi/ic_arrow_back_24dp.png b/res/drawable-hdpi/ic_arrow_back_24dp.png similarity index 100% rename from res-common/drawable-hdpi/ic_arrow_back_24dp.png rename to res/drawable-hdpi/ic_arrow_back_24dp.png Binary files differ
diff --git a/res-common/drawable-hdpi/ic_business_white_120dp.png b/res/drawable-hdpi/ic_business_white_120dp.png similarity index 100% rename from res-common/drawable-hdpi/ic_business_white_120dp.png rename to res/drawable-hdpi/ic_business_white_120dp.png Binary files differ
diff --git a/res-common/drawable-hdpi/ic_call_24dp.png b/res/drawable-hdpi/ic_call_24dp.png similarity index 100% rename from res-common/drawable-hdpi/ic_call_24dp.png rename to res/drawable-hdpi/ic_call_24dp.png Binary files differ
diff --git a/res-common/drawable-hdpi/ic_call_note_white_24dp.png b/res/drawable-hdpi/ic_call_note_white_24dp.png similarity index 100% rename from res-common/drawable-hdpi/ic_call_note_white_24dp.png rename to res/drawable-hdpi/ic_call_note_white_24dp.png Binary files differ
diff --git a/res-common/drawable-hdpi/ic_call_voicemail_holo_dark.png b/res/drawable-hdpi/ic_call_voicemail_holo_dark.png similarity index 100% rename from res-common/drawable-hdpi/ic_call_voicemail_holo_dark.png rename to res/drawable-hdpi/ic_call_voicemail_holo_dark.png Binary files differ
diff --git a/res-common/drawable-hdpi/ic_close_dk.png b/res/drawable-hdpi/ic_close_dk.png similarity index 100% rename from res-common/drawable-hdpi/ic_close_dk.png rename to res/drawable-hdpi/ic_close_dk.png Binary files differ
diff --git a/res-common/drawable-hdpi/ic_create_24dp.png b/res/drawable-hdpi/ic_create_24dp.png similarity index 100% rename from res-common/drawable-hdpi/ic_create_24dp.png rename to res/drawable-hdpi/ic_create_24dp.png Binary files differ
diff --git a/res-common/drawable-hdpi/ic_group_white_24dp.png b/res/drawable-hdpi/ic_group_white_24dp.png similarity index 100% rename from res-common/drawable-hdpi/ic_group_white_24dp.png rename to res/drawable-hdpi/ic_group_white_24dp.png Binary files differ
diff --git a/res-common/drawable-hdpi/ic_history_white_drawable_24dp.png b/res/drawable-hdpi/ic_history_white_drawable_24dp.png similarity index 100% rename from res-common/drawable-hdpi/ic_history_white_drawable_24dp.png rename to res/drawable-hdpi/ic_history_white_drawable_24dp.png Binary files differ
diff --git a/res-common/drawable-hdpi/ic_info_outline_24dp.png b/res/drawable-hdpi/ic_info_outline_24dp.png similarity index 100% rename from res-common/drawable-hdpi/ic_info_outline_24dp.png rename to res/drawable-hdpi/ic_info_outline_24dp.png Binary files differ
diff --git a/res-common/drawable-hdpi/ic_menu_remove_field_holo_light.png b/res/drawable-hdpi/ic_menu_remove_field_holo_light.png similarity index 100% rename from res-common/drawable-hdpi/ic_menu_remove_field_holo_light.png rename to res/drawable-hdpi/ic_menu_remove_field_holo_light.png Binary files differ
diff --git a/res-common/drawable-hdpi/ic_message_24dp.png b/res/drawable-hdpi/ic_message_24dp.png similarity index 100% rename from res-common/drawable-hdpi/ic_message_24dp.png rename to res/drawable-hdpi/ic_message_24dp.png Binary files differ
diff --git a/res-common/drawable-hdpi/ic_person_24dp.png b/res/drawable-hdpi/ic_person_24dp.png similarity index 100% rename from res-common/drawable-hdpi/ic_person_24dp.png rename to res/drawable-hdpi/ic_person_24dp.png Binary files differ
diff --git a/res-common/drawable-hdpi/ic_person_add_24dp.png b/res/drawable-hdpi/ic_person_add_24dp.png similarity index 100% rename from res-common/drawable-hdpi/ic_person_add_24dp.png rename to res/drawable-hdpi/ic_person_add_24dp.png Binary files differ
diff --git a/res-common/drawable-hdpi/ic_person_avatar.png b/res/drawable-hdpi/ic_person_avatar.png similarity index 100% rename from res-common/drawable-hdpi/ic_person_avatar.png rename to res/drawable-hdpi/ic_person_avatar.png Binary files differ
diff --git a/res-common/drawable-hdpi/ic_person_white_120dp.png b/res/drawable-hdpi/ic_person_white_120dp.png similarity index 100% rename from res-common/drawable-hdpi/ic_person_white_120dp.png rename to res/drawable-hdpi/ic_person_white_120dp.png Binary files differ
diff --git a/res-common/drawable-hdpi/ic_scroll_handle.png b/res/drawable-hdpi/ic_scroll_handle.png similarity index 100% rename from res-common/drawable-hdpi/ic_scroll_handle.png rename to res/drawable-hdpi/ic_scroll_handle.png Binary files differ
diff --git a/res-common/drawable-hdpi/ic_videocam.png b/res/drawable-hdpi/ic_videocam.png similarity index 100% rename from res-common/drawable-hdpi/ic_videocam.png rename to res/drawable-hdpi/ic_videocam.png Binary files differ
diff --git a/res-common/drawable-hdpi/ic_voicemail_avatar.png b/res/drawable-hdpi/ic_voicemail_avatar.png similarity index 100% rename from res-common/drawable-hdpi/ic_voicemail_avatar.png rename to res/drawable-hdpi/ic_voicemail_avatar.png Binary files differ
diff --git a/res-common/drawable-hdpi/list_activated_holo.9.png b/res/drawable-hdpi/list_activated_holo.9.png similarity index 100% rename from res-common/drawable-hdpi/list_activated_holo.9.png rename to res/drawable-hdpi/list_activated_holo.9.png Binary files differ
diff --git a/res-common/drawable-hdpi/list_background_holo.9.png b/res/drawable-hdpi/list_background_holo.9.png similarity index 100% rename from res-common/drawable-hdpi/list_background_holo.9.png rename to res/drawable-hdpi/list_background_holo.9.png Binary files differ
diff --git a/res-common/drawable-hdpi/list_focused_holo.9.png b/res/drawable-hdpi/list_focused_holo.9.png similarity index 100% rename from res-common/drawable-hdpi/list_focused_holo.9.png rename to res/drawable-hdpi/list_focused_holo.9.png Binary files differ
diff --git a/res-common/drawable-hdpi/list_longpressed_holo_light.9.png b/res/drawable-hdpi/list_longpressed_holo_light.9.png similarity index 100% rename from res-common/drawable-hdpi/list_longpressed_holo_light.9.png rename to res/drawable-hdpi/list_longpressed_holo_light.9.png Binary files differ
diff --git a/res-common/drawable-hdpi/list_pressed_holo_light.9.png b/res/drawable-hdpi/list_pressed_holo_light.9.png similarity index 100% rename from res-common/drawable-hdpi/list_pressed_holo_light.9.png rename to res/drawable-hdpi/list_pressed_holo_light.9.png Binary files differ
diff --git a/res-common/drawable-hdpi/list_title_holo.9.png b/res/drawable-hdpi/list_title_holo.9.png similarity index 100% rename from res-common/drawable-hdpi/list_title_holo.9.png rename to res/drawable-hdpi/list_title_holo.9.png Binary files differ
diff --git a/res-common/drawable-hdpi/unknown_source.png b/res/drawable-hdpi/unknown_source.png similarity index 100% rename from res-common/drawable-hdpi/unknown_source.png rename to res/drawable-hdpi/unknown_source.png Binary files differ
diff --git a/res-common/drawable-ldrtl-hdpi/list_background_holo.9.png b/res/drawable-ldrtl-hdpi/list_background_holo.9.png similarity index 100% rename from res-common/drawable-ldrtl-hdpi/list_background_holo.9.png rename to res/drawable-ldrtl-hdpi/list_background_holo.9.png Binary files differ
diff --git a/res-common/drawable-ldrtl-hdpi/list_focused_holo.9.png b/res/drawable-ldrtl-hdpi/list_focused_holo.9.png similarity index 100% rename from res-common/drawable-ldrtl-hdpi/list_focused_holo.9.png rename to res/drawable-ldrtl-hdpi/list_focused_holo.9.png Binary files differ
diff --git a/res-common/drawable-ldrtl-hdpi/list_title_holo.9.png b/res/drawable-ldrtl-hdpi/list_title_holo.9.png similarity index 100% rename from res-common/drawable-ldrtl-hdpi/list_title_holo.9.png rename to res/drawable-ldrtl-hdpi/list_title_holo.9.png Binary files differ
diff --git a/res-common/drawable-ldrtl-mdpi/list_background_holo.9.png b/res/drawable-ldrtl-mdpi/list_background_holo.9.png similarity index 100% rename from res-common/drawable-ldrtl-mdpi/list_background_holo.9.png rename to res/drawable-ldrtl-mdpi/list_background_holo.9.png Binary files differ
diff --git a/res-common/drawable-ldrtl-mdpi/list_focused_holo.9.png b/res/drawable-ldrtl-mdpi/list_focused_holo.9.png similarity index 100% rename from res-common/drawable-ldrtl-mdpi/list_focused_holo.9.png rename to res/drawable-ldrtl-mdpi/list_focused_holo.9.png Binary files differ
diff --git a/res-common/drawable-ldrtl-mdpi/list_title_holo.9.png b/res/drawable-ldrtl-mdpi/list_title_holo.9.png similarity index 100% rename from res-common/drawable-ldrtl-mdpi/list_title_holo.9.png rename to res/drawable-ldrtl-mdpi/list_title_holo.9.png Binary files differ
diff --git a/res-common/drawable-ldrtl-sw600dp-hdpi/list_activated_holo.9.png b/res/drawable-ldrtl-sw600dp-hdpi/list_activated_holo.9.png similarity index 100% rename from res-common/drawable-ldrtl-sw600dp-hdpi/list_activated_holo.9.png rename to res/drawable-ldrtl-sw600dp-hdpi/list_activated_holo.9.png Binary files differ
diff --git a/res-common/drawable-ldrtl-sw600dp-mdpi/list_activated_holo.9.png b/res/drawable-ldrtl-sw600dp-mdpi/list_activated_holo.9.png similarity index 100% rename from res-common/drawable-ldrtl-sw600dp-mdpi/list_activated_holo.9.png rename to res/drawable-ldrtl-sw600dp-mdpi/list_activated_holo.9.png Binary files differ
diff --git a/res-common/drawable-ldrtl-sw600dp-xhdpi/list_activated_holo.9.png b/res/drawable-ldrtl-sw600dp-xhdpi/list_activated_holo.9.png similarity index 100% rename from res-common/drawable-ldrtl-sw600dp-xhdpi/list_activated_holo.9.png rename to res/drawable-ldrtl-sw600dp-xhdpi/list_activated_holo.9.png Binary files differ
diff --git a/res-common/drawable-ldrtl-xhdpi/list_background_holo.9.png b/res/drawable-ldrtl-xhdpi/list_background_holo.9.png similarity index 100% rename from res-common/drawable-ldrtl-xhdpi/list_background_holo.9.png rename to res/drawable-ldrtl-xhdpi/list_background_holo.9.png Binary files differ
diff --git a/res-common/drawable-ldrtl-xhdpi/list_focused_holo.9.png b/res/drawable-ldrtl-xhdpi/list_focused_holo.9.png similarity index 100% rename from res-common/drawable-ldrtl-xhdpi/list_focused_holo.9.png rename to res/drawable-ldrtl-xhdpi/list_focused_holo.9.png Binary files differ
diff --git a/res-common/drawable-ldrtl-xhdpi/list_title_holo.9.png b/res/drawable-ldrtl-xhdpi/list_title_holo.9.png similarity index 100% rename from res-common/drawable-ldrtl-xhdpi/list_title_holo.9.png rename to res/drawable-ldrtl-xhdpi/list_title_holo.9.png Binary files differ
diff --git a/res-common/drawable-mdpi/ic_ab_search.png b/res/drawable-mdpi/ic_ab_search.png similarity index 100% rename from res-common/drawable-mdpi/ic_ab_search.png rename to res/drawable-mdpi/ic_ab_search.png Binary files differ
diff --git a/res-common/drawable-mdpi/ic_arrow_back_24dp.png b/res/drawable-mdpi/ic_arrow_back_24dp.png similarity index 100% rename from res-common/drawable-mdpi/ic_arrow_back_24dp.png rename to res/drawable-mdpi/ic_arrow_back_24dp.png Binary files differ
diff --git a/res-common/drawable-mdpi/ic_business_white_120dp.png b/res/drawable-mdpi/ic_business_white_120dp.png similarity index 100% rename from res-common/drawable-mdpi/ic_business_white_120dp.png rename to res/drawable-mdpi/ic_business_white_120dp.png Binary files differ
diff --git a/res-common/drawable-mdpi/ic_call_24dp.png b/res/drawable-mdpi/ic_call_24dp.png similarity index 100% rename from res-common/drawable-mdpi/ic_call_24dp.png rename to res/drawable-mdpi/ic_call_24dp.png Binary files differ
diff --git a/res-common/drawable-mdpi/ic_call_note_white_24dp.png b/res/drawable-mdpi/ic_call_note_white_24dp.png similarity index 100% rename from res-common/drawable-mdpi/ic_call_note_white_24dp.png rename to res/drawable-mdpi/ic_call_note_white_24dp.png Binary files differ
diff --git a/res-common/drawable-mdpi/ic_call_voicemail_holo_dark.png b/res/drawable-mdpi/ic_call_voicemail_holo_dark.png similarity index 100% rename from res-common/drawable-mdpi/ic_call_voicemail_holo_dark.png rename to res/drawable-mdpi/ic_call_voicemail_holo_dark.png Binary files differ
diff --git a/res-common/drawable-mdpi/ic_close_dk.png b/res/drawable-mdpi/ic_close_dk.png similarity index 100% rename from res-common/drawable-mdpi/ic_close_dk.png rename to res/drawable-mdpi/ic_close_dk.png Binary files differ
diff --git a/res-common/drawable-mdpi/ic_create_24dp.png b/res/drawable-mdpi/ic_create_24dp.png similarity index 100% rename from res-common/drawable-mdpi/ic_create_24dp.png rename to res/drawable-mdpi/ic_create_24dp.png Binary files differ
diff --git a/res-common/drawable-mdpi/ic_group_white_24dp.png b/res/drawable-mdpi/ic_group_white_24dp.png similarity index 100% rename from res-common/drawable-mdpi/ic_group_white_24dp.png rename to res/drawable-mdpi/ic_group_white_24dp.png Binary files differ
diff --git a/res-common/drawable-mdpi/ic_history_white_drawable_24dp.png b/res/drawable-mdpi/ic_history_white_drawable_24dp.png similarity index 100% rename from res-common/drawable-mdpi/ic_history_white_drawable_24dp.png rename to res/drawable-mdpi/ic_history_white_drawable_24dp.png Binary files differ
diff --git a/res-common/drawable-mdpi/ic_info_outline_24dp.png b/res/drawable-mdpi/ic_info_outline_24dp.png similarity index 100% rename from res-common/drawable-mdpi/ic_info_outline_24dp.png rename to res/drawable-mdpi/ic_info_outline_24dp.png Binary files differ
diff --git a/res-common/drawable-mdpi/ic_menu_remove_field_holo_light.png b/res/drawable-mdpi/ic_menu_remove_field_holo_light.png similarity index 100% rename from res-common/drawable-mdpi/ic_menu_remove_field_holo_light.png rename to res/drawable-mdpi/ic_menu_remove_field_holo_light.png Binary files differ
diff --git a/res-common/drawable-mdpi/ic_menu_star_holo_light.png b/res/drawable-mdpi/ic_menu_star_holo_light.png similarity index 100% rename from res-common/drawable-mdpi/ic_menu_star_holo_light.png rename to res/drawable-mdpi/ic_menu_star_holo_light.png Binary files differ
diff --git a/res-common/drawable-mdpi/ic_message_24dp.png b/res/drawable-mdpi/ic_message_24dp.png similarity index 100% rename from res-common/drawable-mdpi/ic_message_24dp.png rename to res/drawable-mdpi/ic_message_24dp.png Binary files differ
diff --git a/res-common/drawable-mdpi/ic_person_24dp.png b/res/drawable-mdpi/ic_person_24dp.png similarity index 100% rename from res-common/drawable-mdpi/ic_person_24dp.png rename to res/drawable-mdpi/ic_person_24dp.png Binary files differ
diff --git a/res-common/drawable-mdpi/ic_person_add_24dp.png b/res/drawable-mdpi/ic_person_add_24dp.png similarity index 100% rename from res-common/drawable-mdpi/ic_person_add_24dp.png rename to res/drawable-mdpi/ic_person_add_24dp.png Binary files differ
diff --git a/res-common/drawable-mdpi/ic_person_avatar.png b/res/drawable-mdpi/ic_person_avatar.png similarity index 100% rename from res-common/drawable-mdpi/ic_person_avatar.png rename to res/drawable-mdpi/ic_person_avatar.png Binary files differ
diff --git a/res-common/drawable-mdpi/ic_person_white_120dp.png b/res/drawable-mdpi/ic_person_white_120dp.png similarity index 100% rename from res-common/drawable-mdpi/ic_person_white_120dp.png rename to res/drawable-mdpi/ic_person_white_120dp.png Binary files differ
diff --git a/res-common/drawable-mdpi/ic_scroll_handle.png b/res/drawable-mdpi/ic_scroll_handle.png similarity index 100% rename from res-common/drawable-mdpi/ic_scroll_handle.png rename to res/drawable-mdpi/ic_scroll_handle.png Binary files differ
diff --git a/res-common/drawable-mdpi/ic_videocam.png b/res/drawable-mdpi/ic_videocam.png similarity index 100% rename from res-common/drawable-mdpi/ic_videocam.png rename to res/drawable-mdpi/ic_videocam.png Binary files differ
diff --git a/res-common/drawable-mdpi/ic_voicemail_avatar.png b/res/drawable-mdpi/ic_voicemail_avatar.png similarity index 100% rename from res-common/drawable-mdpi/ic_voicemail_avatar.png rename to res/drawable-mdpi/ic_voicemail_avatar.png Binary files differ
diff --git a/res-common/drawable-mdpi/list_activated_holo.9.png b/res/drawable-mdpi/list_activated_holo.9.png similarity index 100% rename from res-common/drawable-mdpi/list_activated_holo.9.png rename to res/drawable-mdpi/list_activated_holo.9.png Binary files differ
diff --git a/res-common/drawable-mdpi/list_background_holo.9.png b/res/drawable-mdpi/list_background_holo.9.png similarity index 100% rename from res-common/drawable-mdpi/list_background_holo.9.png rename to res/drawable-mdpi/list_background_holo.9.png Binary files differ
diff --git a/res-common/drawable-mdpi/list_focused_holo.9.png b/res/drawable-mdpi/list_focused_holo.9.png similarity index 100% rename from res-common/drawable-mdpi/list_focused_holo.9.png rename to res/drawable-mdpi/list_focused_holo.9.png Binary files differ
diff --git a/res-common/drawable-mdpi/list_longpressed_holo_light.9.png b/res/drawable-mdpi/list_longpressed_holo_light.9.png similarity index 100% rename from res-common/drawable-mdpi/list_longpressed_holo_light.9.png rename to res/drawable-mdpi/list_longpressed_holo_light.9.png Binary files differ
diff --git a/res-common/drawable-mdpi/list_pressed_holo_light.9.png b/res/drawable-mdpi/list_pressed_holo_light.9.png similarity index 100% rename from res-common/drawable-mdpi/list_pressed_holo_light.9.png rename to res/drawable-mdpi/list_pressed_holo_light.9.png Binary files differ
diff --git a/res-common/drawable-mdpi/list_title_holo.9.png b/res/drawable-mdpi/list_title_holo.9.png similarity index 100% rename from res-common/drawable-mdpi/list_title_holo.9.png rename to res/drawable-mdpi/list_title_holo.9.png Binary files differ
diff --git a/res-common/drawable-mdpi/unknown_source.png b/res/drawable-mdpi/unknown_source.png similarity index 100% rename from res-common/drawable-mdpi/unknown_source.png rename to res/drawable-mdpi/unknown_source.png Binary files differ
diff --git a/res-common/drawable-sw600dp-hdpi/list_activated_holo.9.png b/res/drawable-sw600dp-hdpi/list_activated_holo.9.png similarity index 100% rename from res-common/drawable-sw600dp-hdpi/list_activated_holo.9.png rename to res/drawable-sw600dp-hdpi/list_activated_holo.9.png Binary files differ
diff --git a/res-common/drawable-sw600dp-mdpi/list_activated_holo.9.png b/res/drawable-sw600dp-mdpi/list_activated_holo.9.png similarity index 100% rename from res-common/drawable-sw600dp-mdpi/list_activated_holo.9.png rename to res/drawable-sw600dp-mdpi/list_activated_holo.9.png Binary files differ
diff --git a/res-common/drawable-sw600dp-xhdpi/list_activated_holo.9.png b/res/drawable-sw600dp-xhdpi/list_activated_holo.9.png similarity index 100% rename from res-common/drawable-sw600dp-xhdpi/list_activated_holo.9.png rename to res/drawable-sw600dp-xhdpi/list_activated_holo.9.png Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_ab_search.png b/res/drawable-xhdpi/ic_ab_search.png similarity index 100% rename from res-common/drawable-xhdpi/ic_ab_search.png rename to res/drawable-xhdpi/ic_ab_search.png Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_arrow_back_24dp.png b/res/drawable-xhdpi/ic_arrow_back_24dp.png similarity index 100% rename from res-common/drawable-xhdpi/ic_arrow_back_24dp.png rename to res/drawable-xhdpi/ic_arrow_back_24dp.png Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_business_white_120dp.png b/res/drawable-xhdpi/ic_business_white_120dp.png similarity index 100% rename from res-common/drawable-xhdpi/ic_business_white_120dp.png rename to res/drawable-xhdpi/ic_business_white_120dp.png Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_call_24dp.png b/res/drawable-xhdpi/ic_call_24dp.png similarity index 100% rename from res-common/drawable-xhdpi/ic_call_24dp.png rename to res/drawable-xhdpi/ic_call_24dp.png Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_call_note_white_24dp.png b/res/drawable-xhdpi/ic_call_note_white_24dp.png similarity index 100% rename from res-common/drawable-xhdpi/ic_call_note_white_24dp.png rename to res/drawable-xhdpi/ic_call_note_white_24dp.png Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_call_voicemail_holo_dark.png b/res/drawable-xhdpi/ic_call_voicemail_holo_dark.png similarity index 100% rename from res-common/drawable-xhdpi/ic_call_voicemail_holo_dark.png rename to res/drawable-xhdpi/ic_call_voicemail_holo_dark.png Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_close_dk.png b/res/drawable-xhdpi/ic_close_dk.png similarity index 100% rename from res-common/drawable-xhdpi/ic_close_dk.png rename to res/drawable-xhdpi/ic_close_dk.png Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_create_24dp.png b/res/drawable-xhdpi/ic_create_24dp.png similarity index 100% rename from res-common/drawable-xhdpi/ic_create_24dp.png rename to res/drawable-xhdpi/ic_create_24dp.png Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_group_white_24dp.png b/res/drawable-xhdpi/ic_group_white_24dp.png similarity index 100% rename from res-common/drawable-xhdpi/ic_group_white_24dp.png rename to res/drawable-xhdpi/ic_group_white_24dp.png Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_history_white_drawable_24dp.png b/res/drawable-xhdpi/ic_history_white_drawable_24dp.png similarity index 100% rename from res-common/drawable-xhdpi/ic_history_white_drawable_24dp.png rename to res/drawable-xhdpi/ic_history_white_drawable_24dp.png Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_info_outline_24dp.png b/res/drawable-xhdpi/ic_info_outline_24dp.png similarity index 100% rename from res-common/drawable-xhdpi/ic_info_outline_24dp.png rename to res/drawable-xhdpi/ic_info_outline_24dp.png Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_menu_remove_field_holo_light.png b/res/drawable-xhdpi/ic_menu_remove_field_holo_light.png similarity index 100% rename from res-common/drawable-xhdpi/ic_menu_remove_field_holo_light.png rename to res/drawable-xhdpi/ic_menu_remove_field_holo_light.png Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_message_24dp.png b/res/drawable-xhdpi/ic_message_24dp.png similarity index 100% rename from res-common/drawable-xhdpi/ic_message_24dp.png rename to res/drawable-xhdpi/ic_message_24dp.png Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_person_24dp.png b/res/drawable-xhdpi/ic_person_24dp.png similarity index 100% rename from res-common/drawable-xhdpi/ic_person_24dp.png rename to res/drawable-xhdpi/ic_person_24dp.png Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_person_add_24dp.png b/res/drawable-xhdpi/ic_person_add_24dp.png similarity index 100% rename from res-common/drawable-xhdpi/ic_person_add_24dp.png rename to res/drawable-xhdpi/ic_person_add_24dp.png Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_person_avatar.png b/res/drawable-xhdpi/ic_person_avatar.png similarity index 100% rename from res-common/drawable-xhdpi/ic_person_avatar.png rename to res/drawable-xhdpi/ic_person_avatar.png Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_person_white_120dp.png b/res/drawable-xhdpi/ic_person_white_120dp.png similarity index 100% rename from res-common/drawable-xhdpi/ic_person_white_120dp.png rename to res/drawable-xhdpi/ic_person_white_120dp.png Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_scroll_handle.png b/res/drawable-xhdpi/ic_scroll_handle.png similarity index 100% rename from res-common/drawable-xhdpi/ic_scroll_handle.png rename to res/drawable-xhdpi/ic_scroll_handle.png Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_videocam.png b/res/drawable-xhdpi/ic_videocam.png similarity index 100% rename from res-common/drawable-xhdpi/ic_videocam.png rename to res/drawable-xhdpi/ic_videocam.png Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_voicemail_avatar.png b/res/drawable-xhdpi/ic_voicemail_avatar.png similarity index 100% rename from res-common/drawable-xhdpi/ic_voicemail_avatar.png rename to res/drawable-xhdpi/ic_voicemail_avatar.png Binary files differ
diff --git a/res-common/drawable-xhdpi/list_activated_holo.9.png b/res/drawable-xhdpi/list_activated_holo.9.png similarity index 100% rename from res-common/drawable-xhdpi/list_activated_holo.9.png rename to res/drawable-xhdpi/list_activated_holo.9.png Binary files differ
diff --git a/res-common/drawable-xhdpi/list_background_holo.9.png b/res/drawable-xhdpi/list_background_holo.9.png similarity index 100% rename from res-common/drawable-xhdpi/list_background_holo.9.png rename to res/drawable-xhdpi/list_background_holo.9.png Binary files differ
diff --git a/res-common/drawable-xhdpi/list_focused_holo.9.png b/res/drawable-xhdpi/list_focused_holo.9.png similarity index 100% rename from res-common/drawable-xhdpi/list_focused_holo.9.png rename to res/drawable-xhdpi/list_focused_holo.9.png Binary files differ
diff --git a/res-common/drawable-xhdpi/list_longpressed_holo_light.9.png b/res/drawable-xhdpi/list_longpressed_holo_light.9.png similarity index 100% rename from res-common/drawable-xhdpi/list_longpressed_holo_light.9.png rename to res/drawable-xhdpi/list_longpressed_holo_light.9.png Binary files differ
diff --git a/res-common/drawable-xhdpi/list_pressed_holo_light.9.png b/res/drawable-xhdpi/list_pressed_holo_light.9.png similarity index 100% rename from res-common/drawable-xhdpi/list_pressed_holo_light.9.png rename to res/drawable-xhdpi/list_pressed_holo_light.9.png Binary files differ
diff --git a/res-common/drawable-xhdpi/list_title_holo.9.png b/res/drawable-xhdpi/list_title_holo.9.png similarity index 100% rename from res-common/drawable-xhdpi/list_title_holo.9.png rename to res/drawable-xhdpi/list_title_holo.9.png Binary files differ
diff --git a/res-common/drawable-xhdpi/unknown_source.png b/res/drawable-xhdpi/unknown_source.png similarity index 100% rename from res-common/drawable-xhdpi/unknown_source.png rename to res/drawable-xhdpi/unknown_source.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_ab_search.png b/res/drawable-xxhdpi/ic_ab_search.png similarity index 100% rename from res-common/drawable-xxhdpi/ic_ab_search.png rename to res/drawable-xxhdpi/ic_ab_search.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_arrow_back_24dp.png b/res/drawable-xxhdpi/ic_arrow_back_24dp.png similarity index 100% rename from res-common/drawable-xxhdpi/ic_arrow_back_24dp.png rename to res/drawable-xxhdpi/ic_arrow_back_24dp.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_business_white_120dp.png b/res/drawable-xxhdpi/ic_business_white_120dp.png similarity index 100% rename from res-common/drawable-xxhdpi/ic_business_white_120dp.png rename to res/drawable-xxhdpi/ic_business_white_120dp.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_call_24dp.png b/res/drawable-xxhdpi/ic_call_24dp.png similarity index 100% rename from res-common/drawable-xxhdpi/ic_call_24dp.png rename to res/drawable-xxhdpi/ic_call_24dp.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_call_note_white_24dp.png b/res/drawable-xxhdpi/ic_call_note_white_24dp.png similarity index 100% rename from res-common/drawable-xxhdpi/ic_call_note_white_24dp.png rename to res/drawable-xxhdpi/ic_call_note_white_24dp.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_call_voicemail_holo_dark.png b/res/drawable-xxhdpi/ic_call_voicemail_holo_dark.png similarity index 100% rename from res-common/drawable-xxhdpi/ic_call_voicemail_holo_dark.png rename to res/drawable-xxhdpi/ic_call_voicemail_holo_dark.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_close_dk.png b/res/drawable-xxhdpi/ic_close_dk.png similarity index 100% rename from res-common/drawable-xxhdpi/ic_close_dk.png rename to res/drawable-xxhdpi/ic_close_dk.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_create_24dp.png b/res/drawable-xxhdpi/ic_create_24dp.png similarity index 100% rename from res-common/drawable-xxhdpi/ic_create_24dp.png rename to res/drawable-xxhdpi/ic_create_24dp.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_group_white_24dp.png b/res/drawable-xxhdpi/ic_group_white_24dp.png similarity index 100% rename from res-common/drawable-xxhdpi/ic_group_white_24dp.png rename to res/drawable-xxhdpi/ic_group_white_24dp.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_history_white_drawable_24dp.png b/res/drawable-xxhdpi/ic_history_white_drawable_24dp.png similarity index 100% rename from res-common/drawable-xxhdpi/ic_history_white_drawable_24dp.png rename to res/drawable-xxhdpi/ic_history_white_drawable_24dp.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_info_outline_24dp.png b/res/drawable-xxhdpi/ic_info_outline_24dp.png similarity index 100% rename from res-common/drawable-xxhdpi/ic_info_outline_24dp.png rename to res/drawable-xxhdpi/ic_info_outline_24dp.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_menu_remove_field_holo_light.png b/res/drawable-xxhdpi/ic_menu_remove_field_holo_light.png similarity index 100% rename from res-common/drawable-xxhdpi/ic_menu_remove_field_holo_light.png rename to res/drawable-xxhdpi/ic_menu_remove_field_holo_light.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_message_24dp.png b/res/drawable-xxhdpi/ic_message_24dp.png similarity index 100% rename from res-common/drawable-xxhdpi/ic_message_24dp.png rename to res/drawable-xxhdpi/ic_message_24dp.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_person_24dp.png b/res/drawable-xxhdpi/ic_person_24dp.png similarity index 100% rename from res-common/drawable-xxhdpi/ic_person_24dp.png rename to res/drawable-xxhdpi/ic_person_24dp.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_person_add_24dp.png b/res/drawable-xxhdpi/ic_person_add_24dp.png similarity index 100% rename from res-common/drawable-xxhdpi/ic_person_add_24dp.png rename to res/drawable-xxhdpi/ic_person_add_24dp.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_person_avatar.png b/res/drawable-xxhdpi/ic_person_avatar.png similarity index 100% rename from res-common/drawable-xxhdpi/ic_person_avatar.png rename to res/drawable-xxhdpi/ic_person_avatar.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_person_white_120dp.png b/res/drawable-xxhdpi/ic_person_white_120dp.png similarity index 100% rename from res-common/drawable-xxhdpi/ic_person_white_120dp.png rename to res/drawable-xxhdpi/ic_person_white_120dp.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_scroll_handle.png b/res/drawable-xxhdpi/ic_scroll_handle.png similarity index 100% rename from res-common/drawable-xxhdpi/ic_scroll_handle.png rename to res/drawable-xxhdpi/ic_scroll_handle.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_videocam.png b/res/drawable-xxhdpi/ic_videocam.png similarity index 100% rename from res-common/drawable-xxhdpi/ic_videocam.png rename to res/drawable-xxhdpi/ic_videocam.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_voicemail_avatar.png b/res/drawable-xxhdpi/ic_voicemail_avatar.png similarity index 100% rename from res-common/drawable-xxhdpi/ic_voicemail_avatar.png rename to res/drawable-xxhdpi/ic_voicemail_avatar.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/list_activated_holo.9.png b/res/drawable-xxhdpi/list_activated_holo.9.png similarity index 100% rename from res-common/drawable-xxhdpi/list_activated_holo.9.png rename to res/drawable-xxhdpi/list_activated_holo.9.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/list_focused_holo.9.png b/res/drawable-xxhdpi/list_focused_holo.9.png similarity index 100% rename from res-common/drawable-xxhdpi/list_focused_holo.9.png rename to res/drawable-xxhdpi/list_focused_holo.9.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/list_longpressed_holo_light.9.png b/res/drawable-xxhdpi/list_longpressed_holo_light.9.png similarity index 100% rename from res-common/drawable-xxhdpi/list_longpressed_holo_light.9.png rename to res/drawable-xxhdpi/list_longpressed_holo_light.9.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/list_pressed_holo_light.9.png b/res/drawable-xxhdpi/list_pressed_holo_light.9.png similarity index 100% rename from res-common/drawable-xxhdpi/list_pressed_holo_light.9.png rename to res/drawable-xxhdpi/list_pressed_holo_light.9.png Binary files differ
diff --git a/res-common/drawable-xxhdpi/list_title_holo.9.png b/res/drawable-xxhdpi/list_title_holo.9.png similarity index 100% rename from res-common/drawable-xxhdpi/list_title_holo.9.png rename to res/drawable-xxhdpi/list_title_holo.9.png Binary files differ
diff --git a/res-common/drawable-xxxhdpi/ic_ab_search.png b/res/drawable-xxxhdpi/ic_ab_search.png similarity index 100% rename from res-common/drawable-xxxhdpi/ic_ab_search.png rename to res/drawable-xxxhdpi/ic_ab_search.png Binary files differ
diff --git a/res-common/drawable-xxxhdpi/ic_arrow_back_24dp.png b/res/drawable-xxxhdpi/ic_arrow_back_24dp.png similarity index 100% rename from res-common/drawable-xxxhdpi/ic_arrow_back_24dp.png rename to res/drawable-xxxhdpi/ic_arrow_back_24dp.png Binary files differ
diff --git a/res-common/drawable-xxxhdpi/ic_business_white_120dp.png b/res/drawable-xxxhdpi/ic_business_white_120dp.png similarity index 100% rename from res-common/drawable-xxxhdpi/ic_business_white_120dp.png rename to res/drawable-xxxhdpi/ic_business_white_120dp.png Binary files differ
diff --git a/res-common/drawable-xxxhdpi/ic_call_24dp.png b/res/drawable-xxxhdpi/ic_call_24dp.png similarity index 100% rename from res-common/drawable-xxxhdpi/ic_call_24dp.png rename to res/drawable-xxxhdpi/ic_call_24dp.png Binary files differ
diff --git a/res-common/drawable-xxxhdpi/ic_call_note_white_24dp.png b/res/drawable-xxxhdpi/ic_call_note_white_24dp.png similarity index 100% rename from res-common/drawable-xxxhdpi/ic_call_note_white_24dp.png rename to res/drawable-xxxhdpi/ic_call_note_white_24dp.png Binary files differ
diff --git a/res-common/drawable-xxxhdpi/ic_close_dk.png b/res/drawable-xxxhdpi/ic_close_dk.png similarity index 100% rename from res-common/drawable-xxxhdpi/ic_close_dk.png rename to res/drawable-xxxhdpi/ic_close_dk.png Binary files differ
diff --git a/res-common/drawable-xxxhdpi/ic_create_24dp.png b/res/drawable-xxxhdpi/ic_create_24dp.png similarity index 100% rename from res-common/drawable-xxxhdpi/ic_create_24dp.png rename to res/drawable-xxxhdpi/ic_create_24dp.png Binary files differ
diff --git a/res-common/drawable-xxxhdpi/ic_history_white_drawable_24dp.png b/res/drawable-xxxhdpi/ic_history_white_drawable_24dp.png similarity index 100% rename from res-common/drawable-xxxhdpi/ic_history_white_drawable_24dp.png rename to res/drawable-xxxhdpi/ic_history_white_drawable_24dp.png Binary files differ
diff --git a/res-common/drawable-xxxhdpi/ic_info_outline_24dp.png b/res/drawable-xxxhdpi/ic_info_outline_24dp.png similarity index 100% rename from res-common/drawable-xxxhdpi/ic_info_outline_24dp.png rename to res/drawable-xxxhdpi/ic_info_outline_24dp.png Binary files differ
diff --git a/res-common/drawable-xxxhdpi/ic_message_24dp.png b/res/drawable-xxxhdpi/ic_message_24dp.png similarity index 100% rename from res-common/drawable-xxxhdpi/ic_message_24dp.png rename to res/drawable-xxxhdpi/ic_message_24dp.png Binary files differ
diff --git a/res-common/drawable-xxxhdpi/ic_person_24dp.png b/res/drawable-xxxhdpi/ic_person_24dp.png similarity index 100% rename from res-common/drawable-xxxhdpi/ic_person_24dp.png rename to res/drawable-xxxhdpi/ic_person_24dp.png Binary files differ
diff --git a/res-common/drawable-xxxhdpi/ic_person_add_24dp.png b/res/drawable-xxxhdpi/ic_person_add_24dp.png similarity index 100% rename from res-common/drawable-xxxhdpi/ic_person_add_24dp.png rename to res/drawable-xxxhdpi/ic_person_add_24dp.png Binary files differ
diff --git a/res-common/drawable-xxxhdpi/ic_person_avatar.png b/res/drawable-xxxhdpi/ic_person_avatar.png similarity index 100% rename from res-common/drawable-xxxhdpi/ic_person_avatar.png rename to res/drawable-xxxhdpi/ic_person_avatar.png Binary files differ
diff --git a/res-common/drawable-xxxhdpi/ic_person_white_120dp.png b/res/drawable-xxxhdpi/ic_person_white_120dp.png similarity index 100% rename from res-common/drawable-xxxhdpi/ic_person_white_120dp.png rename to res/drawable-xxxhdpi/ic_person_white_120dp.png Binary files differ
diff --git a/res-common/drawable-xxxhdpi/ic_scroll_handle.png b/res/drawable-xxxhdpi/ic_scroll_handle.png similarity index 100% rename from res-common/drawable-xxxhdpi/ic_scroll_handle.png rename to res/drawable-xxxhdpi/ic_scroll_handle.png Binary files differ
diff --git a/res-common/drawable-xxxhdpi/ic_videocam.png b/res/drawable-xxxhdpi/ic_videocam.png similarity index 100% rename from res-common/drawable-xxxhdpi/ic_videocam.png rename to res/drawable-xxxhdpi/ic_videocam.png Binary files differ
diff --git a/res-common/drawable/dialog_background_material.xml b/res/drawable/dialog_background_material.xml similarity index 100% rename from res-common/drawable/dialog_background_material.xml rename to res/drawable/dialog_background_material.xml
diff --git a/res-common/drawable/fastscroll_thumb.xml b/res/drawable/fastscroll_thumb.xml similarity index 100% rename from res-common/drawable/fastscroll_thumb.xml rename to res/drawable/fastscroll_thumb.xml
diff --git a/res-common/drawable/ic_back_arrow.xml b/res/drawable/ic_back_arrow.xml similarity index 100% rename from res-common/drawable/ic_back_arrow.xml rename to res/drawable/ic_back_arrow.xml
diff --git a/res-common/drawable/ic_call.xml b/res/drawable/ic_call.xml similarity index 100% rename from res-common/drawable/ic_call.xml rename to res/drawable/ic_call.xml
diff --git a/res-common/drawable/ic_cancel_black_24dp.xml b/res/drawable/ic_cancel_black_24dp.xml similarity index 100% rename from res-common/drawable/ic_cancel_black_24dp.xml rename to res/drawable/ic_cancel_black_24dp.xml
diff --git a/res-common/drawable/ic_check_mark.xml b/res/drawable/ic_check_mark.xml similarity index 100% rename from res-common/drawable/ic_check_mark.xml rename to res/drawable/ic_check_mark.xml
diff --git a/res-common/drawable/ic_close_black_24dp.xml b/res/drawable/ic_close_black_24dp.xml similarity index 100% rename from res-common/drawable/ic_close_black_24dp.xml rename to res/drawable/ic_close_black_24dp.xml
diff --git a/res-common/drawable/ic_device.xml b/res/drawable/ic_device.xml similarity index 100% rename from res-common/drawable/ic_device.xml rename to res/drawable/ic_device.xml
diff --git a/res-common/drawable/ic_material_star.xml b/res/drawable/ic_material_star.xml similarity index 100% rename from res-common/drawable/ic_material_star.xml rename to res/drawable/ic_material_star.xml
diff --git a/res-common/drawable/ic_message_24dp_mirrored.xml b/res/drawable/ic_message_24dp_mirrored.xml similarity index 100% rename from res-common/drawable/ic_message_24dp_mirrored.xml rename to res/drawable/ic_message_24dp_mirrored.xml
diff --git a/res-common/drawable/ic_more_vert.xml b/res/drawable/ic_more_vert.xml similarity index 100% rename from res-common/drawable/ic_more_vert.xml rename to res/drawable/ic_more_vert.xml
diff --git a/res-common/drawable/ic_person_add_tinted_24dp.xml b/res/drawable/ic_person_add_tinted_24dp.xml similarity index 100% rename from res-common/drawable/ic_person_add_tinted_24dp.xml rename to res/drawable/ic_person_add_tinted_24dp.xml
diff --git a/res-common/drawable/ic_scroll_handle_default.xml b/res/drawable/ic_scroll_handle_default.xml similarity index 100% rename from res-common/drawable/ic_scroll_handle_default.xml rename to res/drawable/ic_scroll_handle_default.xml
diff --git a/res-common/drawable/ic_scroll_handle_pressed.xml b/res/drawable/ic_scroll_handle_pressed.xml similarity index 100% rename from res-common/drawable/ic_scroll_handle_pressed.xml rename to res/drawable/ic_scroll_handle_pressed.xml
diff --git a/res-common/drawable/ic_search_add_contact.xml b/res/drawable/ic_search_add_contact.xml similarity index 100% rename from res-common/drawable/ic_search_add_contact.xml rename to res/drawable/ic_search_add_contact.xml
diff --git a/res-common/drawable/ic_search_video_call.xml b/res/drawable/ic_search_video_call.xml similarity index 100% rename from res-common/drawable/ic_search_video_call.xml rename to res/drawable/ic_search_video_call.xml
diff --git a/res-common/drawable/ic_work_profile.xml b/res/drawable/ic_work_profile.xml similarity index 100% rename from res-common/drawable/ic_work_profile.xml rename to res/drawable/ic_work_profile.xml
diff --git a/res-common/drawable/item_background_material_borderless_dark.xml b/res/drawable/item_background_material_borderless_dark.xml similarity index 100% rename from res-common/drawable/item_background_material_borderless_dark.xml rename to res/drawable/item_background_material_borderless_dark.xml
diff --git a/res-common/drawable/item_background_material_dark.xml b/res/drawable/item_background_material_dark.xml similarity index 100% rename from res-common/drawable/item_background_material_dark.xml rename to res/drawable/item_background_material_dark.xml
diff --git a/res-common/drawable/list_item_activated_background.xml b/res/drawable/list_item_activated_background.xml similarity index 100% rename from res-common/drawable/list_item_activated_background.xml rename to res/drawable/list_item_activated_background.xml
diff --git a/res-common/drawable/searchedittext_custom_cursor.xml b/res/drawable/searchedittext_custom_cursor.xml similarity index 100% rename from res-common/drawable/searchedittext_custom_cursor.xml rename to res/drawable/searchedittext_custom_cursor.xml
diff --git a/res-common/drawable/unread_count_background.xml b/res/drawable/unread_count_background.xml similarity index 100% rename from res-common/drawable/unread_count_background.xml rename to res/drawable/unread_count_background.xml
diff --git a/res-common/layout-ldrtl/unread_count_tab.xml b/res/layout-ldrtl/unread_count_tab.xml similarity index 100% rename from res-common/layout-ldrtl/unread_count_tab.xml rename to res/layout-ldrtl/unread_count_tab.xml
diff --git a/res-common/layout/account_filter_header.xml b/res/layout/account_filter_header.xml similarity index 100% rename from res-common/layout/account_filter_header.xml rename to res/layout/account_filter_header.xml
diff --git a/res-common/layout/account_selector_list_item.xml b/res/layout/account_selector_list_item.xml similarity index 100% rename from res-common/layout/account_selector_list_item.xml rename to res/layout/account_selector_list_item.xml
diff --git a/res-common/layout/account_selector_list_item_condensed.xml b/res/layout/account_selector_list_item_condensed.xml similarity index 100% rename from res-common/layout/account_selector_list_item_condensed.xml rename to res/layout/account_selector_list_item_condensed.xml
diff --git a/res-common/layout/call_subject_history_list_item.xml b/res/layout/call_subject_history_list_item.xml similarity index 100% rename from res-common/layout/call_subject_history_list_item.xml rename to res/layout/call_subject_history_list_item.xml
diff --git a/res-common/layout/contact_list_card.xml b/res/layout/contact_list_card.xml similarity index 100% rename from res-common/layout/contact_list_card.xml rename to res/layout/contact_list_card.xml
diff --git a/res-common/layout/contact_list_content.xml b/res/layout/contact_list_content.xml similarity index 100% rename from res-common/layout/contact_list_content.xml rename to res/layout/contact_list_content.xml
diff --git a/res-common/layout/contact_list_filter.xml b/res/layout/contact_list_filter.xml similarity index 100% rename from res-common/layout/contact_list_filter.xml rename to res/layout/contact_list_filter.xml
diff --git a/res-common/layout/contact_list_filter_custom.xml b/res/layout/contact_list_filter_custom.xml similarity index 100% rename from res-common/layout/contact_list_filter_custom.xml rename to res/layout/contact_list_filter_custom.xml
diff --git a/res-common/layout/contact_list_filter_item.xml b/res/layout/contact_list_filter_item.xml similarity index 100% rename from res-common/layout/contact_list_filter_item.xml rename to res/layout/contact_list_filter_item.xml
diff --git a/res-common/layout/contact_tile_frequent.xml b/res/layout/contact_tile_frequent.xml similarity index 100% rename from res-common/layout/contact_tile_frequent.xml rename to res/layout/contact_tile_frequent.xml
diff --git a/res-common/layout/contact_tile_frequent_phone.xml b/res/layout/contact_tile_frequent_phone.xml similarity index 100% rename from res-common/layout/contact_tile_frequent_phone.xml rename to res/layout/contact_tile_frequent_phone.xml
diff --git a/res-common/layout/contact_tile_starred.xml b/res/layout/contact_tile_starred.xml similarity index 100% rename from res-common/layout/contact_tile_starred.xml rename to res/layout/contact_tile_starred.xml
diff --git a/res-common/layout/contact_tile_starred_quick_contact.xml b/res/layout/contact_tile_starred_quick_contact.xml similarity index 100% rename from res-common/layout/contact_tile_starred_quick_contact.xml rename to res/layout/contact_tile_starred_quick_contact.xml
diff --git a/res-common/layout/custom_contact_list_filter_account.xml b/res/layout/custom_contact_list_filter_account.xml similarity index 100% rename from res-common/layout/custom_contact_list_filter_account.xml rename to res/layout/custom_contact_list_filter_account.xml
diff --git a/res-common/layout/custom_contact_list_filter_group.xml b/res/layout/custom_contact_list_filter_group.xml similarity index 100% rename from res-common/layout/custom_contact_list_filter_group.xml rename to res/layout/custom_contact_list_filter_group.xml
diff --git a/res-common/layout/default_account_checkbox.xml b/res/layout/default_account_checkbox.xml similarity index 100% rename from res-common/layout/default_account_checkbox.xml rename to res/layout/default_account_checkbox.xml
diff --git a/res-common/layout/dialog_call_subject.xml b/res/layout/dialog_call_subject.xml similarity index 100% rename from res-common/layout/dialog_call_subject.xml rename to res/layout/dialog_call_subject.xml
diff --git a/res-common/layout/dialog_title.xml b/res/layout/dialog_title.xml similarity index 100% rename from res-common/layout/dialog_title.xml rename to res/layout/dialog_title.xml
diff --git a/res-common/layout/directory_header.xml b/res/layout/directory_header.xml similarity index 100% rename from res-common/layout/directory_header.xml rename to res/layout/directory_header.xml
diff --git a/res-common/layout/licenses.xml b/res/layout/licenses.xml similarity index 100% rename from res-common/layout/licenses.xml rename to res/layout/licenses.xml
diff --git a/res-common/layout/list_separator.xml b/res/layout/list_separator.xml similarity index 100% rename from res-common/layout/list_separator.xml rename to res/layout/list_separator.xml
diff --git a/res-common/layout/search_bar_expanded.xml b/res/layout/search_bar_expanded.xml similarity index 100% rename from res-common/layout/search_bar_expanded.xml rename to res/layout/search_bar_expanded.xml
diff --git a/res-common/layout/select_account_list_item.xml b/res/layout/select_account_list_item.xml similarity index 100% rename from res-common/layout/select_account_list_item.xml rename to res/layout/select_account_list_item.xml
diff --git a/res-common/layout/select_dialog_item.xml b/res/layout/select_dialog_item.xml similarity index 100% rename from res-common/layout/select_dialog_item.xml rename to res/layout/select_dialog_item.xml
diff --git a/res-common/layout/unread_count_tab.xml b/res/layout/unread_count_tab.xml similarity index 100% rename from res-common/layout/unread_count_tab.xml rename to res/layout/unread_count_tab.xml
diff --git a/res-common/values-ja/donottranslate_config.xml b/res/values-ja/donottranslate_config.xml similarity index 100% rename from res-common/values-ja/donottranslate_config.xml rename to res/values-ja/donottranslate_config.xml
diff --git a/res-common/values-ko/donottranslate_config.xml b/res/values-ko/donottranslate_config.xml similarity index 100% rename from res-common/values-ko/donottranslate_config.xml rename to res/values-ko/donottranslate_config.xml
diff --git a/res-common/values-sw600dp/strings.xml b/res/values-sw600dp/strings.xml similarity index 100% rename from res-common/values-sw600dp/strings.xml rename to res/values-sw600dp/strings.xml
diff --git a/res-common/values-sw720dp-land/integers.xml b/res/values-sw720dp-land/integers.xml similarity index 100% rename from res-common/values-sw720dp-land/integers.xml rename to res/values-sw720dp-land/integers.xml
diff --git a/res-common/values-zh-rCN/donottranslate_config.xml b/res/values-zh-rCN/donottranslate_config.xml similarity index 100% rename from res-common/values-zh-rCN/donottranslate_config.xml rename to res/values-zh-rCN/donottranslate_config.xml
diff --git a/res-common/values-zh-rTW/donottranslate_config.xml b/res/values-zh-rTW/donottranslate_config.xml similarity index 100% rename from res-common/values-zh-rTW/donottranslate_config.xml rename to res/values-zh-rTW/donottranslate_config.xml
diff --git a/res-common/values/animation_constants.xml b/res/values/animation_constants.xml similarity index 100% rename from res-common/values/animation_constants.xml rename to res/values/animation_constants.xml
diff --git a/res-common/xml/preference_about.xml b/res/xml/preference_about.xml similarity index 100% rename from res-common/xml/preference_about.xml rename to res/xml/preference_about.xml
diff --git a/res-common/xml/preference_display_options.xml b/res/xml/preference_display_options.xml similarity index 100% rename from res-common/xml/preference_display_options.xml rename to res/xml/preference_display_options.xml
