From 84a6d29f889148c49db278f0682bbdf8d8466b1f Mon Sep 17 00:00:00 2001 From: twyen Date: Mon, 25 Jun 2018 15:25:35 -0700 Subject: Move contacts.commons.R to dialer.contacts.resources This reduces dependency on contacts.common which is full of things that should not be there. Ideally resources inside dialer.contacts.resources should be individually moved to appropriate locations, but the resources are too large to work with. TEST=TAP Test: TAP PiperOrigin-RevId: 202029832 Change-Id: I95bfcb59799b9c3640de03ad0680624fc1b2c3a3 --- .../contacts/common/dialog/CallSubjectDialog.java | 2 +- .../common/dialog/ClearFrequentsDialog.java | 2 +- .../contacts/common/list/ContactTileView.java | 2 +- .../contacts/common/list/ViewPagerTabStrip.java | 2 +- .../contacts/common/list/ViewPagerTabs.java | 2 +- .../contacts/common/model/account/AccountType.java | 2 +- .../common/model/account/BaseAccountType.java | 2 +- .../common/model/account/ExchangeAccountType.java | 6 +- .../common/model/account/ExternalAccountType.java | 30 +- .../common/model/account/FallbackAccountType.java | 6 +- .../common/model/account/GoogleAccountType.java | 6 +- .../common/model/account/SamsungAccountType.java | 6 +- .../res/drawable-hdpi/ic_call_note_white_24dp.png | Bin 373 -> 0 bytes .../common/res/drawable-hdpi/ic_phone_attach.png | Bin 828 -> 0 bytes .../common/res/drawable-hdpi/ic_scroll_handle.png | Bin 544 -> 0 bytes .../res/drawable-mdpi/ic_call_note_white_24dp.png | Bin 266 -> 0 bytes .../common/res/drawable-mdpi/ic_phone_attach.png | Bin 476 -> 0 bytes .../common/res/drawable-mdpi/ic_scroll_handle.png | Bin 504 -> 0 bytes .../res/drawable-xhdpi/ic_call_note_white_24dp.png | Bin 449 -> 0 bytes .../common/res/drawable-xhdpi/ic_phone_attach.png | Bin 1009 -> 0 bytes .../common/res/drawable-xhdpi/ic_scroll_handle.png | Bin 620 -> 0 bytes .../drawable-xxhdpi/ic_call_note_white_24dp.png | Bin 647 -> 0 bytes .../common/res/drawable-xxhdpi/ic_phone_attach.png | Bin 1517 -> 0 bytes .../res/drawable-xxhdpi/ic_scroll_handle.png | Bin 837 -> 0 bytes .../drawable-xxxhdpi/ic_call_note_white_24dp.png | Bin 853 -> 0 bytes .../res/drawable-xxxhdpi/ic_phone_attach.png | Bin 2135 -> 0 bytes .../res/drawable-xxxhdpi/ic_scroll_handle.png | Bin 1579 -> 0 bytes .../contacts/common/res/drawable/back_arrow.xml | 26 -- .../res/drawable/dialog_background_material.xml | 23 -- .../common/res/drawable/fastscroll_thumb.xml | 19 - .../res/drawable/ic_scroll_handle_default.xml | 20 - .../res/drawable/ic_scroll_handle_pressed.xml | 20 - .../common/res/drawable/ic_work_profile.xml | 26 -- .../res/drawable/searchedittext_custom_cursor.xml | 21 - .../res/drawable/unread_count_background.xml | 21 - .../common/res/layout-ldrtl/unread_count_tab.xml | 48 --- .../common/res/layout/account_filter_header.xml | 44 --- .../res/layout/call_subject_history_list_item.xml | 29 -- .../res/layout/contact_detail_list_padding.xml | 27 -- .../common/res/layout/contact_list_card.xml | 39 -- .../common/res/layout/contact_list_content.xml | 61 --- .../common/res/layout/default_account_checkbox.xml | 50 --- .../common/res/layout/dialog_call_subject.xml | 159 -------- .../common/res/layout/directory_header.xml | 55 --- .../common/res/layout/search_bar_expanded.xml | 64 --- .../common/res/layout/select_account_list_item.xml | 69 ---- .../common/res/layout/unread_count_tab.xml | 43 --- .../res/mipmap-hdpi/ic_contacts_launcher.png | Bin 3169 -> 0 bytes .../res/mipmap-mdpi/ic_contacts_launcher.png | Bin 2062 -> 0 bytes .../res/mipmap-xhdpi/ic_contacts_launcher.png | Bin 4430 -> 0 bytes .../res/mipmap-xxhdpi/ic_contacts_launcher.png | Bin 7228 -> 0 bytes .../res/mipmap-xxxhdpi/ic_contacts_launcher.png | Bin 10065 -> 0 bytes .../common/res/values-ja/donottranslate_config.xml | 33 -- .../common/res/values-ko/donottranslate_config.xml | 17 - .../contacts/common/res/values-land/integers.xml | 22 -- .../common/res/values-sw600dp-land/integers.xml | 22 -- .../contacts/common/res/values-sw600dp/dimens.xml | 26 -- .../common/res/values-sw600dp/integers.xml | 24 -- .../common/res/values-sw720dp-land/integers.xml | 22 -- .../common/res/values-sw720dp/integers.xml | 22 -- .../res/values-zh-rCN/donottranslate_config.xml | 17 - .../res/values-zh-rTW/donottranslate_config.xml | 17 - .../common/res/values/animation_constants.xml | 19 - .../android/contacts/common/res/values/attrs.xml | 83 ---- .../android/contacts/common/res/values/colors.xml | 51 --- .../android/contacts/common/res/values/dimens.xml | 99 ----- .../common/res/values/donottranslate_config.xml | 41 -- .../com/android/contacts/common/res/values/ids.xml | 31 -- .../contacts/common/res/values/integers.xml | 35 -- .../android/contacts/common/res/values/strings.xml | 410 -------------------- .../android/contacts/common/res/values/styles.xml | 96 ----- .../contacts/common/util/AccountFilterUtil.java | 2 +- .../contacts/common/util/ContactDisplayUtils.java | 2 +- .../contacts/common/util/ContactListViewUtils.java | 2 +- .../common/util/MaterialColorMapUtils.java | 5 +- .../widget/SelectPhoneAccountDialogFragment.java | 2 +- .../dialer/callcomposer/CallComposerActivity.java | 2 +- .../calldetails/CallDetailsHeaderViewHolder.java | 2 +- .../dialer/contacts/resources/AndroidManifest.xml | 16 + .../res/drawable-hdpi/ic_call_note_white_24dp.png | Bin 0 -> 373 bytes .../res/drawable-hdpi/ic_phone_attach.png | Bin 0 -> 828 bytes .../res/drawable-hdpi/ic_scroll_handle.png | Bin 0 -> 544 bytes .../res/drawable-mdpi/ic_call_note_white_24dp.png | Bin 0 -> 266 bytes .../res/drawable-mdpi/ic_phone_attach.png | Bin 0 -> 476 bytes .../res/drawable-mdpi/ic_scroll_handle.png | Bin 0 -> 504 bytes .../res/drawable-xhdpi/ic_call_note_white_24dp.png | Bin 0 -> 449 bytes .../res/drawable-xhdpi/ic_phone_attach.png | Bin 0 -> 1009 bytes .../res/drawable-xhdpi/ic_scroll_handle.png | Bin 0 -> 620 bytes .../drawable-xxhdpi/ic_call_note_white_24dp.png | Bin 0 -> 647 bytes .../res/drawable-xxhdpi/ic_phone_attach.png | Bin 0 -> 1517 bytes .../res/drawable-xxhdpi/ic_scroll_handle.png | Bin 0 -> 837 bytes .../drawable-xxxhdpi/ic_call_note_white_24dp.png | Bin 0 -> 853 bytes .../res/drawable-xxxhdpi/ic_phone_attach.png | Bin 0 -> 2135 bytes .../res/drawable-xxxhdpi/ic_scroll_handle.png | Bin 0 -> 1579 bytes .../contacts/resources/res/drawable/back_arrow.xml | 26 ++ .../res/drawable/dialog_background_material.xml | 23 ++ .../resources/res/drawable/fastscroll_thumb.xml | 19 + .../res/drawable/ic_scroll_handle_default.xml | 20 + .../res/drawable/ic_scroll_handle_pressed.xml | 20 + .../resources/res/drawable/ic_work_profile.xml | 26 ++ .../res/drawable/searchedittext_custom_cursor.xml | 21 + .../res/drawable/unread_count_background.xml | 21 + .../res/layout-ldrtl/unread_count_tab.xml | 48 +++ .../resources/res/layout/account_filter_header.xml | 44 +++ .../res/layout/call_subject_history_list_item.xml | 29 ++ .../res/layout/contact_detail_list_padding.xml | 27 ++ .../resources/res/layout/contact_list_card.xml | 39 ++ .../resources/res/layout/contact_list_content.xml | 61 +++ .../res/layout/default_account_checkbox.xml | 50 +++ .../resources/res/layout/dialog_call_subject.xml | 159 ++++++++ .../resources/res/layout/directory_header.xml | 55 +++ .../resources/res/layout/search_bar_expanded.xml | 64 +++ .../res/layout/select_account_list_item.xml | 69 ++++ .../resources/res/layout/unread_count_tab.xml | 43 +++ .../res/mipmap-hdpi/ic_contacts_launcher.png | Bin 0 -> 3169 bytes .../res/mipmap-mdpi/ic_contacts_launcher.png | Bin 0 -> 2062 bytes .../res/mipmap-xhdpi/ic_contacts_launcher.png | Bin 0 -> 4430 bytes .../res/mipmap-xxhdpi/ic_contacts_launcher.png | Bin 0 -> 7228 bytes .../res/mipmap-xxxhdpi/ic_contacts_launcher.png | Bin 0 -> 10065 bytes .../res/values-ja/donottranslate_config.xml | 33 ++ .../res/values-ko/donottranslate_config.xml | 32 ++ .../resources/res/values-land/integers.xml | 22 ++ .../resources/res/values-sw600dp-land/integers.xml | 22 ++ .../resources/res/values-sw600dp/dimens.xml | 26 ++ .../resources/res/values-sw600dp/integers.xml | 24 ++ .../resources/res/values-sw720dp-land/integers.xml | 22 ++ .../resources/res/values-sw720dp/integers.xml | 22 ++ .../res/values-zh-rCN/donottranslate_config.xml | 32 ++ .../res/values-zh-rTW/donottranslate_config.xml | 32 ++ .../resources/res/values/animation_constants.xml | 19 + .../dialer/contacts/resources/res/values/attrs.xml | 83 ++++ .../contacts/resources/res/values/colors.xml | 51 +++ .../contacts/resources/res/values/dimens.xml | 99 +++++ .../resources/res/values/donottranslate_config.xml | 41 ++ .../dialer/contacts/resources/res/values/ids.xml | 31 ++ .../contacts/resources/res/values/integers.xml | 35 ++ .../contacts/resources/res/values/strings.xml | 430 +++++++++++++++++++++ .../contacts/resources/res/values/styles.xml | 96 +++++ .../dialer/contactsfragment/ContactsAdapter.java | 3 +- .../dialer/database/DialerDatabaseHelper.java | 2 +- .../cp2/SearchContactViewHolder.java | 6 +- 141 files changed, 2080 insertions(+), 1999 deletions(-) delete mode 100644 java/com/android/contacts/common/res/drawable-hdpi/ic_call_note_white_24dp.png delete mode 100644 java/com/android/contacts/common/res/drawable-hdpi/ic_phone_attach.png delete mode 100644 java/com/android/contacts/common/res/drawable-hdpi/ic_scroll_handle.png delete mode 100644 java/com/android/contacts/common/res/drawable-mdpi/ic_call_note_white_24dp.png delete mode 100644 java/com/android/contacts/common/res/drawable-mdpi/ic_phone_attach.png delete mode 100644 java/com/android/contacts/common/res/drawable-mdpi/ic_scroll_handle.png delete mode 100644 java/com/android/contacts/common/res/drawable-xhdpi/ic_call_note_white_24dp.png delete mode 100644 java/com/android/contacts/common/res/drawable-xhdpi/ic_phone_attach.png delete mode 100644 java/com/android/contacts/common/res/drawable-xhdpi/ic_scroll_handle.png delete mode 100644 java/com/android/contacts/common/res/drawable-xxhdpi/ic_call_note_white_24dp.png delete mode 100644 java/com/android/contacts/common/res/drawable-xxhdpi/ic_phone_attach.png delete mode 100644 java/com/android/contacts/common/res/drawable-xxhdpi/ic_scroll_handle.png delete mode 100644 java/com/android/contacts/common/res/drawable-xxxhdpi/ic_call_note_white_24dp.png delete mode 100644 java/com/android/contacts/common/res/drawable-xxxhdpi/ic_phone_attach.png delete mode 100644 java/com/android/contacts/common/res/drawable-xxxhdpi/ic_scroll_handle.png delete mode 100644 java/com/android/contacts/common/res/drawable/back_arrow.xml delete mode 100644 java/com/android/contacts/common/res/drawable/dialog_background_material.xml delete mode 100644 java/com/android/contacts/common/res/drawable/fastscroll_thumb.xml delete mode 100644 java/com/android/contacts/common/res/drawable/ic_scroll_handle_default.xml delete mode 100644 java/com/android/contacts/common/res/drawable/ic_scroll_handle_pressed.xml delete mode 100644 java/com/android/contacts/common/res/drawable/ic_work_profile.xml delete mode 100644 java/com/android/contacts/common/res/drawable/searchedittext_custom_cursor.xml delete mode 100644 java/com/android/contacts/common/res/drawable/unread_count_background.xml delete mode 100644 java/com/android/contacts/common/res/layout-ldrtl/unread_count_tab.xml delete mode 100644 java/com/android/contacts/common/res/layout/account_filter_header.xml delete mode 100644 java/com/android/contacts/common/res/layout/call_subject_history_list_item.xml delete mode 100644 java/com/android/contacts/common/res/layout/contact_detail_list_padding.xml delete mode 100644 java/com/android/contacts/common/res/layout/contact_list_card.xml delete mode 100644 java/com/android/contacts/common/res/layout/contact_list_content.xml delete mode 100644 java/com/android/contacts/common/res/layout/default_account_checkbox.xml delete mode 100644 java/com/android/contacts/common/res/layout/dialog_call_subject.xml delete mode 100644 java/com/android/contacts/common/res/layout/directory_header.xml delete mode 100644 java/com/android/contacts/common/res/layout/search_bar_expanded.xml delete mode 100644 java/com/android/contacts/common/res/layout/select_account_list_item.xml delete mode 100644 java/com/android/contacts/common/res/layout/unread_count_tab.xml delete mode 100644 java/com/android/contacts/common/res/mipmap-hdpi/ic_contacts_launcher.png delete mode 100644 java/com/android/contacts/common/res/mipmap-mdpi/ic_contacts_launcher.png delete mode 100644 java/com/android/contacts/common/res/mipmap-xhdpi/ic_contacts_launcher.png delete mode 100644 java/com/android/contacts/common/res/mipmap-xxhdpi/ic_contacts_launcher.png delete mode 100644 java/com/android/contacts/common/res/mipmap-xxxhdpi/ic_contacts_launcher.png delete mode 100644 java/com/android/contacts/common/res/values-ja/donottranslate_config.xml delete mode 100644 java/com/android/contacts/common/res/values-ko/donottranslate_config.xml delete mode 100644 java/com/android/contacts/common/res/values-land/integers.xml delete mode 100644 java/com/android/contacts/common/res/values-sw600dp-land/integers.xml delete mode 100644 java/com/android/contacts/common/res/values-sw600dp/dimens.xml delete mode 100644 java/com/android/contacts/common/res/values-sw600dp/integers.xml delete mode 100644 java/com/android/contacts/common/res/values-sw720dp-land/integers.xml delete mode 100644 java/com/android/contacts/common/res/values-sw720dp/integers.xml delete mode 100644 java/com/android/contacts/common/res/values-zh-rCN/donottranslate_config.xml delete mode 100644 java/com/android/contacts/common/res/values-zh-rTW/donottranslate_config.xml delete mode 100644 java/com/android/contacts/common/res/values/animation_constants.xml delete mode 100644 java/com/android/contacts/common/res/values/attrs.xml delete mode 100644 java/com/android/contacts/common/res/values/colors.xml delete mode 100644 java/com/android/contacts/common/res/values/dimens.xml delete mode 100644 java/com/android/contacts/common/res/values/donottranslate_config.xml delete mode 100644 java/com/android/contacts/common/res/values/ids.xml delete mode 100644 java/com/android/contacts/common/res/values/integers.xml delete mode 100644 java/com/android/contacts/common/res/values/strings.xml delete mode 100644 java/com/android/contacts/common/res/values/styles.xml create mode 100644 java/com/android/dialer/contacts/resources/AndroidManifest.xml create mode 100644 java/com/android/dialer/contacts/resources/res/drawable-hdpi/ic_call_note_white_24dp.png create mode 100644 java/com/android/dialer/contacts/resources/res/drawable-hdpi/ic_phone_attach.png create mode 100644 java/com/android/dialer/contacts/resources/res/drawable-hdpi/ic_scroll_handle.png create mode 100644 java/com/android/dialer/contacts/resources/res/drawable-mdpi/ic_call_note_white_24dp.png create mode 100644 java/com/android/dialer/contacts/resources/res/drawable-mdpi/ic_phone_attach.png create mode 100644 java/com/android/dialer/contacts/resources/res/drawable-mdpi/ic_scroll_handle.png create mode 100644 java/com/android/dialer/contacts/resources/res/drawable-xhdpi/ic_call_note_white_24dp.png create mode 100644 java/com/android/dialer/contacts/resources/res/drawable-xhdpi/ic_phone_attach.png create mode 100644 java/com/android/dialer/contacts/resources/res/drawable-xhdpi/ic_scroll_handle.png create mode 100644 java/com/android/dialer/contacts/resources/res/drawable-xxhdpi/ic_call_note_white_24dp.png create mode 100644 java/com/android/dialer/contacts/resources/res/drawable-xxhdpi/ic_phone_attach.png create mode 100644 java/com/android/dialer/contacts/resources/res/drawable-xxhdpi/ic_scroll_handle.png create mode 100644 java/com/android/dialer/contacts/resources/res/drawable-xxxhdpi/ic_call_note_white_24dp.png create mode 100644 java/com/android/dialer/contacts/resources/res/drawable-xxxhdpi/ic_phone_attach.png create mode 100644 java/com/android/dialer/contacts/resources/res/drawable-xxxhdpi/ic_scroll_handle.png create mode 100644 java/com/android/dialer/contacts/resources/res/drawable/back_arrow.xml create mode 100644 java/com/android/dialer/contacts/resources/res/drawable/dialog_background_material.xml create mode 100644 java/com/android/dialer/contacts/resources/res/drawable/fastscroll_thumb.xml create mode 100644 java/com/android/dialer/contacts/resources/res/drawable/ic_scroll_handle_default.xml create mode 100644 java/com/android/dialer/contacts/resources/res/drawable/ic_scroll_handle_pressed.xml create mode 100644 java/com/android/dialer/contacts/resources/res/drawable/ic_work_profile.xml create mode 100644 java/com/android/dialer/contacts/resources/res/drawable/searchedittext_custom_cursor.xml create mode 100644 java/com/android/dialer/contacts/resources/res/drawable/unread_count_background.xml create mode 100644 java/com/android/dialer/contacts/resources/res/layout-ldrtl/unread_count_tab.xml create mode 100644 java/com/android/dialer/contacts/resources/res/layout/account_filter_header.xml create mode 100644 java/com/android/dialer/contacts/resources/res/layout/call_subject_history_list_item.xml create mode 100644 java/com/android/dialer/contacts/resources/res/layout/contact_detail_list_padding.xml create mode 100644 java/com/android/dialer/contacts/resources/res/layout/contact_list_card.xml create mode 100644 java/com/android/dialer/contacts/resources/res/layout/contact_list_content.xml create mode 100644 java/com/android/dialer/contacts/resources/res/layout/default_account_checkbox.xml create mode 100644 java/com/android/dialer/contacts/resources/res/layout/dialog_call_subject.xml create mode 100644 java/com/android/dialer/contacts/resources/res/layout/directory_header.xml create mode 100644 java/com/android/dialer/contacts/resources/res/layout/search_bar_expanded.xml create mode 100644 java/com/android/dialer/contacts/resources/res/layout/select_account_list_item.xml create mode 100644 java/com/android/dialer/contacts/resources/res/layout/unread_count_tab.xml create mode 100644 java/com/android/dialer/contacts/resources/res/mipmap-hdpi/ic_contacts_launcher.png create mode 100644 java/com/android/dialer/contacts/resources/res/mipmap-mdpi/ic_contacts_launcher.png create mode 100644 java/com/android/dialer/contacts/resources/res/mipmap-xhdpi/ic_contacts_launcher.png create mode 100644 java/com/android/dialer/contacts/resources/res/mipmap-xxhdpi/ic_contacts_launcher.png create mode 100644 java/com/android/dialer/contacts/resources/res/mipmap-xxxhdpi/ic_contacts_launcher.png create mode 100644 java/com/android/dialer/contacts/resources/res/values-ja/donottranslate_config.xml create mode 100644 java/com/android/dialer/contacts/resources/res/values-ko/donottranslate_config.xml create mode 100644 java/com/android/dialer/contacts/resources/res/values-land/integers.xml create mode 100644 java/com/android/dialer/contacts/resources/res/values-sw600dp-land/integers.xml create mode 100644 java/com/android/dialer/contacts/resources/res/values-sw600dp/dimens.xml create mode 100644 java/com/android/dialer/contacts/resources/res/values-sw600dp/integers.xml create mode 100644 java/com/android/dialer/contacts/resources/res/values-sw720dp-land/integers.xml create mode 100644 java/com/android/dialer/contacts/resources/res/values-sw720dp/integers.xml create mode 100644 java/com/android/dialer/contacts/resources/res/values-zh-rCN/donottranslate_config.xml create mode 100644 java/com/android/dialer/contacts/resources/res/values-zh-rTW/donottranslate_config.xml create mode 100644 java/com/android/dialer/contacts/resources/res/values/animation_constants.xml create mode 100644 java/com/android/dialer/contacts/resources/res/values/attrs.xml create mode 100644 java/com/android/dialer/contacts/resources/res/values/colors.xml create mode 100644 java/com/android/dialer/contacts/resources/res/values/dimens.xml create mode 100644 java/com/android/dialer/contacts/resources/res/values/donottranslate_config.xml create mode 100644 java/com/android/dialer/contacts/resources/res/values/ids.xml create mode 100644 java/com/android/dialer/contacts/resources/res/values/integers.xml create mode 100644 java/com/android/dialer/contacts/resources/res/values/strings.xml create mode 100644 java/com/android/dialer/contacts/resources/res/values/styles.xml (limited to 'java/com/android') diff --git a/java/com/android/contacts/common/dialog/CallSubjectDialog.java b/java/com/android/contacts/common/dialog/CallSubjectDialog.java index bbf31e844..bf0ac14b2 100644 --- a/java/com/android/contacts/common/dialog/CallSubjectDialog.java +++ b/java/com/android/contacts/common/dialog/CallSubjectDialog.java @@ -41,12 +41,12 @@ import android.widget.EditText; import android.widget.ListView; import android.widget.QuickContactBadge; import android.widget.TextView; -import com.android.contacts.common.R; import com.android.dialer.animation.AnimUtils; import com.android.dialer.callintent.CallInitiationType; import com.android.dialer.callintent.CallIntentBuilder; import com.android.dialer.common.LogUtil; import com.android.dialer.contactphoto.ContactPhotoManager; +import com.android.dialer.contacts.resources.R; import com.android.dialer.lettertile.LetterTileDrawable; import com.android.dialer.precall.PreCall; import com.android.dialer.util.ViewUtil; diff --git a/java/com/android/contacts/common/dialog/ClearFrequentsDialog.java b/java/com/android/contacts/common/dialog/ClearFrequentsDialog.java index 751490a22..cd9511c38 100644 --- a/java/com/android/contacts/common/dialog/ClearFrequentsDialog.java +++ b/java/com/android/contacts/common/dialog/ClearFrequentsDialog.java @@ -28,7 +28,7 @@ import android.content.DialogInterface.OnClickListener; import android.os.AsyncTask; import android.os.Bundle; import android.provider.ContactsContract; -import com.android.contacts.common.R; +import com.android.dialer.contacts.resources.R; import com.android.dialer.util.PermissionsUtil; /** Dialog that clears the frequently contacted list after confirming with the user. */ diff --git a/java/com/android/contacts/common/list/ContactTileView.java b/java/com/android/contacts/common/list/ContactTileView.java index 072e07dd2..732cee7e1 100644 --- a/java/com/android/contacts/common/list/ContactTileView.java +++ b/java/com/android/contacts/common/list/ContactTileView.java @@ -23,12 +23,12 @@ import android.view.View; import android.widget.FrameLayout; import android.widget.ImageView; import com.android.contacts.common.MoreContactUtils; -import com.android.contacts.common.R; import com.android.dialer.callintent.CallInitiationType; import com.android.dialer.callintent.CallSpecificAppData; import com.android.dialer.common.LogUtil; import com.android.dialer.contactphoto.ContactPhotoManager; import com.android.dialer.contactphoto.ContactPhotoManager.DefaultImageRequest; +import com.android.dialer.contacts.resources.R; import com.android.dialer.widget.BidiTextView; /** A ContactTile displays a contact's picture and name */ diff --git a/java/com/android/contacts/common/list/ViewPagerTabStrip.java b/java/com/android/contacts/common/list/ViewPagerTabStrip.java index 88c0369d6..7a9e506db 100644 --- a/java/com/android/contacts/common/list/ViewPagerTabStrip.java +++ b/java/com/android/contacts/common/list/ViewPagerTabStrip.java @@ -23,7 +23,7 @@ import android.graphics.Paint; import android.util.AttributeSet; import android.view.View; import android.widget.LinearLayout; -import com.android.contacts.common.R; +import com.android.dialer.contacts.resources.R; import com.android.dialer.theme.base.ThemeComponent; public class ViewPagerTabStrip extends LinearLayout { diff --git a/java/com/android/contacts/common/list/ViewPagerTabs.java b/java/com/android/contacts/common/list/ViewPagerTabs.java index f48fd29ca..b3242ee2b 100644 --- a/java/com/android/contacts/common/list/ViewPagerTabs.java +++ b/java/com/android/contacts/common/list/ViewPagerTabs.java @@ -32,7 +32,7 @@ import android.widget.HorizontalScrollView; import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; -import com.android.contacts.common.R; +import com.android.dialer.contacts.resources.R; /** * Lightweight implementation of ViewPager tabs. This looks similar to traditional actionBar tabs, diff --git a/java/com/android/contacts/common/model/account/AccountType.java b/java/com/android/contacts/common/model/account/AccountType.java index ed0d421a9..499286a13 100644 --- a/java/com/android/contacts/common/model/account/AccountType.java +++ b/java/com/android/contacts/common/model/account/AccountType.java @@ -29,8 +29,8 @@ import android.support.v4.content.ContextCompat; import android.util.ArrayMap; import android.view.inputmethod.EditorInfo; import android.widget.EditText; -import com.android.contacts.common.R; import com.android.contacts.common.model.dataitem.DataKind; +import com.android.dialer.contacts.resources.R; import java.text.Collator; import java.util.ArrayList; import java.util.Collections; diff --git a/java/com/android/contacts/common/model/account/BaseAccountType.java b/java/com/android/contacts/common/model/account/BaseAccountType.java index ccdad3641..2911975d5 100644 --- a/java/com/android/contacts/common/model/account/BaseAccountType.java +++ b/java/com/android/contacts/common/model/account/BaseAccountType.java @@ -37,11 +37,11 @@ import android.provider.ContactsContract.CommonDataKinds.Website; import android.util.ArrayMap; import android.util.AttributeSet; import android.view.inputmethod.EditorInfo; -import com.android.contacts.common.R; import com.android.contacts.common.model.dataitem.DataKind; import com.android.contacts.common.util.CommonDateUtils; import com.android.contacts.common.util.ContactDisplayUtils; import com.android.dialer.common.LogUtil; +import com.android.dialer.contacts.resources.R; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/java/com/android/contacts/common/model/account/ExchangeAccountType.java b/java/com/android/contacts/common/model/account/ExchangeAccountType.java index a27028e80..0a95e7ecb 100644 --- a/java/com/android/contacts/common/model/account/ExchangeAccountType.java +++ b/java/com/android/contacts/common/model/account/ExchangeAccountType.java @@ -29,10 +29,10 @@ import android.provider.ContactsContract.CommonDataKinds.Photo; import android.provider.ContactsContract.CommonDataKinds.StructuredName; import android.provider.ContactsContract.CommonDataKinds.StructuredPostal; import android.provider.ContactsContract.CommonDataKinds.Website; -import android.util.Log; -import com.android.contacts.common.R; import com.android.contacts.common.model.dataitem.DataKind; import com.android.contacts.common.util.CommonDateUtils; +import com.android.dialer.common.LogUtil; +import com.android.dialer.contacts.resources.R; import java.util.ArrayList; import java.util.Locale; @@ -67,7 +67,7 @@ public class ExchangeAccountType extends BaseAccountType { mIsInitialized = true; } catch (DefinitionException e) { - Log.e(TAG, "Problem building account type", e); + LogUtil.e(TAG, "Problem building account type", e); } } diff --git a/java/com/android/contacts/common/model/account/ExternalAccountType.java b/java/com/android/contacts/common/model/account/ExternalAccountType.java index aca1f70d2..618def78a 100644 --- a/java/com/android/contacts/common/model/account/ExternalAccountType.java +++ b/java/com/android/contacts/common/model/account/ExternalAccountType.java @@ -30,10 +30,10 @@ import android.provider.ContactsContract.CommonDataKinds.StructuredName; import android.support.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.AttributeSet; -import android.util.Log; import android.util.Xml; -import com.android.contacts.common.R; import com.android.contacts.common.model.dataitem.DataKind; +import com.android.dialer.common.LogUtil; +import com.android.dialer.contacts.resources.R; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -152,7 +152,7 @@ public class ExternalAccountType extends BaseAccountType { error.append(" for external package "); error.append(packageName); - Log.e(TAG, error.toString(), e); + LogUtil.e(TAG, error.toString(), e); return; } finally { if (parser != null) { @@ -210,13 +210,11 @@ public class ExternalAccountType extends BaseAccountType { for (String metadataName : METADATA_CONTACTS_NAMES) { final XmlResourceParser parser = serviceInfo.loadXmlMetaData(pm, metadataName); if (parser != null) { - if (Log.isLoggable(TAG, Log.DEBUG)) { - Log.d( - TAG, - String.format( - "Metadata loaded from: %s, %s, %s", - serviceInfo.packageName, serviceInfo.name, metadataName)); - } + LogUtil.d( + TAG, + String.format( + "Metadata loaded from: %s, %s, %s", + serviceInfo.packageName, serviceInfo.name, metadataName)); return parser; } } @@ -250,7 +248,7 @@ public class ExternalAccountType extends BaseAccountType { return -1; // Empty text is okay. } if (resourceName.charAt(0) != '@') { - Log.e(TAG, xmlAttributeName + " must be a resource name beginnig with '@'"); + LogUtil.e(TAG, xmlAttributeName + " must be a resource name beginnig with '@'"); return -1; } final String name = resourceName.substring(1); @@ -258,12 +256,12 @@ public class ExternalAccountType extends BaseAccountType { try { res = context.getPackageManager().getResourcesForApplication(packageName); } catch (NameNotFoundException e) { - Log.e(TAG, "Unable to load package " + packageName); + LogUtil.e(TAG, "Unable to load package " + packageName); return -1; } final int resId = res.getIdentifier(name, null, packageName); if (resId == 0) { - Log.e(TAG, "Unable to load " + resourceName + " from package " + packageName); + LogUtil.e(TAG, "Unable to load " + resourceName + " from package " + packageName); return -1; } return resId; @@ -366,9 +364,7 @@ public class ExternalAccountType extends BaseAccountType { for (int i = 0; i < attributeCount; i++) { String attr = parser.getAttributeName(i); String value = parser.getAttributeValue(i); - if (Log.isLoggable(TAG, Log.DEBUG)) { - Log.d(TAG, attr + "=" + value); - } + LogUtil.d(TAG, attr + "=" + value); if (ATTR_EDIT_CONTACT_ACTIVITY.equals(attr)) { mEditContactActivityClassName = value; } else if (ATTR_CREATE_CONTACT_ACTIVITY.equals(attr)) { @@ -394,7 +390,7 @@ public class ExternalAccountType extends BaseAccountType { } else if (ATTR_ACCOUNT_ICON.equals(attr)) { mAccountTypeIconAttribute = value; } else { - Log.e(TAG, "Unsupported attribute " + attr); + LogUtil.e(TAG, "Unsupported attribute " + attr); } } diff --git a/java/com/android/contacts/common/model/account/FallbackAccountType.java b/java/com/android/contacts/common/model/account/FallbackAccountType.java index 976a7b892..ee3a7578d 100644 --- a/java/com/android/contacts/common/model/account/FallbackAccountType.java +++ b/java/com/android/contacts/common/model/account/FallbackAccountType.java @@ -17,9 +17,9 @@ package com.android.contacts.common.model.account; import android.content.Context; -import android.util.Log; -import com.android.contacts.common.R; import com.android.contacts.common.model.dataitem.DataKind; +import com.android.dialer.common.LogUtil; +import com.android.dialer.contacts.resources.R; public class FallbackAccountType extends BaseAccountType { @@ -53,7 +53,7 @@ public class FallbackAccountType extends BaseAccountType { mIsInitialized = true; } catch (DefinitionException e) { - Log.e(TAG, "Problem building account type", e); + LogUtil.e(TAG, "Problem building account type", e); } } diff --git a/java/com/android/contacts/common/model/account/GoogleAccountType.java b/java/com/android/contacts/common/model/account/GoogleAccountType.java index 2f1fe0ed6..a25544bb9 100644 --- a/java/com/android/contacts/common/model/account/GoogleAccountType.java +++ b/java/com/android/contacts/common/model/account/GoogleAccountType.java @@ -22,10 +22,10 @@ import android.provider.ContactsContract.CommonDataKinds.Email; import android.provider.ContactsContract.CommonDataKinds.Event; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.CommonDataKinds.Relation; -import android.util.Log; -import com.android.contacts.common.R; import com.android.contacts.common.model.dataitem.DataKind; import com.android.contacts.common.util.CommonDateUtils; +import com.android.dialer.common.LogUtil; +import com.android.dialer.contacts.resources.R; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -69,7 +69,7 @@ public class GoogleAccountType extends BaseAccountType { mIsInitialized = true; } catch (DefinitionException e) { - Log.e(TAG, "Problem building account type", e); + LogUtil.e(TAG, "Problem building account type", e); } } diff --git a/java/com/android/contacts/common/model/account/SamsungAccountType.java b/java/com/android/contacts/common/model/account/SamsungAccountType.java index 45406bc2b..77c0575ea 100644 --- a/java/com/android/contacts/common/model/account/SamsungAccountType.java +++ b/java/com/android/contacts/common/model/account/SamsungAccountType.java @@ -23,10 +23,10 @@ import android.provider.ContactsContract.CommonDataKinds.Event; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.CommonDataKinds.Relation; import android.provider.ContactsContract.CommonDataKinds.StructuredPostal; -import android.util.Log; -import com.android.contacts.common.R; import com.android.contacts.common.model.dataitem.DataKind; import com.android.contacts.common.util.CommonDateUtils; +import com.android.dialer.common.LogUtil; +import com.android.dialer.contacts.resources.R; import java.util.ArrayList; import java.util.Locale; @@ -69,7 +69,7 @@ public class SamsungAccountType extends BaseAccountType { mIsInitialized = true; } catch (DefinitionException e) { - Log.e(TAG, "Problem building account type", e); + LogUtil.e(TAG, "Problem building account type", e); } } diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_call_note_white_24dp.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_call_note_white_24dp.png deleted file mode 100644 index 503e58e22..000000000 Binary files a/java/com/android/contacts/common/res/drawable-hdpi/ic_call_note_white_24dp.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_phone_attach.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_phone_attach.png deleted file mode 100644 index 84b1227bd..000000000 Binary files a/java/com/android/contacts/common/res/drawable-hdpi/ic_phone_attach.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_scroll_handle.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_scroll_handle.png deleted file mode 100644 index 3aa29b852..000000000 Binary files a/java/com/android/contacts/common/res/drawable-hdpi/ic_scroll_handle.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/drawable-mdpi/ic_call_note_white_24dp.png b/java/com/android/contacts/common/res/drawable-mdpi/ic_call_note_white_24dp.png deleted file mode 100644 index 9d359db9f..000000000 Binary files a/java/com/android/contacts/common/res/drawable-mdpi/ic_call_note_white_24dp.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/drawable-mdpi/ic_phone_attach.png b/java/com/android/contacts/common/res/drawable-mdpi/ic_phone_attach.png deleted file mode 100644 index fc4ddd32c..000000000 Binary files a/java/com/android/contacts/common/res/drawable-mdpi/ic_phone_attach.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/drawable-mdpi/ic_scroll_handle.png b/java/com/android/contacts/common/res/drawable-mdpi/ic_scroll_handle.png deleted file mode 100644 index af75db4b4..000000000 Binary files a/java/com/android/contacts/common/res/drawable-mdpi/ic_scroll_handle.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/drawable-xhdpi/ic_call_note_white_24dp.png b/java/com/android/contacts/common/res/drawable-xhdpi/ic_call_note_white_24dp.png deleted file mode 100644 index 40eed1d12..000000000 Binary files a/java/com/android/contacts/common/res/drawable-xhdpi/ic_call_note_white_24dp.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/drawable-xhdpi/ic_phone_attach.png b/java/com/android/contacts/common/res/drawable-xhdpi/ic_phone_attach.png deleted file mode 100644 index fdfafed9a..000000000 Binary files a/java/com/android/contacts/common/res/drawable-xhdpi/ic_phone_attach.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/drawable-xhdpi/ic_scroll_handle.png b/java/com/android/contacts/common/res/drawable-xhdpi/ic_scroll_handle.png deleted file mode 100644 index 2d43c4d5b..000000000 Binary files a/java/com/android/contacts/common/res/drawable-xhdpi/ic_scroll_handle.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/drawable-xxhdpi/ic_call_note_white_24dp.png b/java/com/android/contacts/common/res/drawable-xxhdpi/ic_call_note_white_24dp.png deleted file mode 100644 index 2656cad18..000000000 Binary files a/java/com/android/contacts/common/res/drawable-xxhdpi/ic_call_note_white_24dp.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/drawable-xxhdpi/ic_phone_attach.png b/java/com/android/contacts/common/res/drawable-xxhdpi/ic_phone_attach.png deleted file mode 100644 index 6a6cdeeaa..000000000 Binary files a/java/com/android/contacts/common/res/drawable-xxhdpi/ic_phone_attach.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/drawable-xxhdpi/ic_scroll_handle.png b/java/com/android/contacts/common/res/drawable-xxhdpi/ic_scroll_handle.png deleted file mode 100644 index 55f1d1369..000000000 Binary files a/java/com/android/contacts/common/res/drawable-xxhdpi/ic_scroll_handle.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_call_note_white_24dp.png b/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_call_note_white_24dp.png deleted file mode 100644 index 903c1623d..000000000 Binary files a/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_call_note_white_24dp.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_phone_attach.png b/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_phone_attach.png deleted file mode 100644 index b072ad11f..000000000 Binary files a/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_phone_attach.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_scroll_handle.png b/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_scroll_handle.png deleted file mode 100644 index d90782a32..000000000 Binary files a/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_scroll_handle.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/drawable/back_arrow.xml b/java/com/android/contacts/common/res/drawable/back_arrow.xml deleted file mode 100644 index 34fa3d7fc..000000000 --- a/java/com/android/contacts/common/res/drawable/back_arrow.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - diff --git a/java/com/android/contacts/common/res/drawable/dialog_background_material.xml b/java/com/android/contacts/common/res/drawable/dialog_background_material.xml deleted file mode 100644 index c93d43ea6..000000000 --- a/java/com/android/contacts/common/res/drawable/dialog_background_material.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/java/com/android/contacts/common/res/drawable/fastscroll_thumb.xml b/java/com/android/contacts/common/res/drawable/fastscroll_thumb.xml deleted file mode 100644 index 67645ff91..000000000 --- a/java/com/android/contacts/common/res/drawable/fastscroll_thumb.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/java/com/android/contacts/common/res/drawable/ic_scroll_handle_default.xml b/java/com/android/contacts/common/res/drawable/ic_scroll_handle_default.xml deleted file mode 100644 index 9164ab1ab..000000000 --- a/java/com/android/contacts/common/res/drawable/ic_scroll_handle_default.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - diff --git a/java/com/android/contacts/common/res/drawable/ic_scroll_handle_pressed.xml b/java/com/android/contacts/common/res/drawable/ic_scroll_handle_pressed.xml deleted file mode 100644 index c9b93d925..000000000 --- a/java/com/android/contacts/common/res/drawable/ic_scroll_handle_pressed.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - \ No newline at end of file diff --git a/java/com/android/contacts/common/res/drawable/ic_work_profile.xml b/java/com/android/contacts/common/res/drawable/ic_work_profile.xml deleted file mode 100644 index 445288595..000000000 --- a/java/com/android/contacts/common/res/drawable/ic_work_profile.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - diff --git a/java/com/android/contacts/common/res/drawable/searchedittext_custom_cursor.xml b/java/com/android/contacts/common/res/drawable/searchedittext_custom_cursor.xml deleted file mode 100644 index 51e984ca0..000000000 --- a/java/com/android/contacts/common/res/drawable/searchedittext_custom_cursor.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/java/com/android/contacts/common/res/drawable/unread_count_background.xml b/java/com/android/contacts/common/res/drawable/unread_count_background.xml deleted file mode 100644 index b58baef7c..000000000 --- a/java/com/android/contacts/common/res/drawable/unread_count_background.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/com/android/contacts/common/res/layout-ldrtl/unread_count_tab.xml b/java/com/android/contacts/common/res/layout-ldrtl/unread_count_tab.xml deleted file mode 100644 index 51d56bb22..000000000 --- a/java/com/android/contacts/common/res/layout-ldrtl/unread_count_tab.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - diff --git a/java/com/android/contacts/common/res/layout/account_filter_header.xml b/java/com/android/contacts/common/res/layout/account_filter_header.xml deleted file mode 100644 index 592c240a9..000000000 --- a/java/com/android/contacts/common/res/layout/account_filter_header.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - diff --git a/java/com/android/contacts/common/res/layout/call_subject_history_list_item.xml b/java/com/android/contacts/common/res/layout/call_subject_history_list_item.xml deleted file mode 100644 index c08327c29..000000000 --- a/java/com/android/contacts/common/res/layout/call_subject_history_list_item.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - diff --git a/java/com/android/contacts/common/res/layout/contact_detail_list_padding.xml b/java/com/android/contacts/common/res/layout/contact_detail_list_padding.xml deleted file mode 100644 index 02a5c809c..000000000 --- a/java/com/android/contacts/common/res/layout/contact_detail_list_padding.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - diff --git a/java/com/android/contacts/common/res/layout/contact_list_card.xml b/java/com/android/contacts/common/res/layout/contact_list_card.xml deleted file mode 100644 index 37bb8ea27..000000000 --- a/java/com/android/contacts/common/res/layout/contact_list_card.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - diff --git a/java/com/android/contacts/common/res/layout/contact_list_content.xml b/java/com/android/contacts/common/res/layout/contact_list_content.xml deleted file mode 100644 index 3ee27a0ad..000000000 --- a/java/com/android/contacts/common/res/layout/contact_list_content.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/java/com/android/contacts/common/res/layout/default_account_checkbox.xml b/java/com/android/contacts/common/res/layout/default_account_checkbox.xml deleted file mode 100644 index 911098397..000000000 --- a/java/com/android/contacts/common/res/layout/default_account_checkbox.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - /> - - - - diff --git a/java/com/android/contacts/common/res/layout/dialog_call_subject.xml b/java/com/android/contacts/common/res/layout/dialog_call_subject.xml deleted file mode 100644 index d20aa3b45..000000000 --- a/java/com/android/contacts/common/res/layout/dialog_call_subject.xml +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/java/com/android/contacts/common/res/layout/directory_header.xml b/java/com/android/contacts/common/res/layout/directory_header.xml deleted file mode 100644 index b8f5163c0..000000000 --- a/java/com/android/contacts/common/res/layout/directory_header.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - diff --git a/java/com/android/contacts/common/res/layout/search_bar_expanded.xml b/java/com/android/contacts/common/res/layout/search_bar_expanded.xml deleted file mode 100644 index c9ab6a92d..000000000 --- a/java/com/android/contacts/common/res/layout/search_bar_expanded.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - diff --git a/java/com/android/contacts/common/res/layout/select_account_list_item.xml b/java/com/android/contacts/common/res/layout/select_account_list_item.xml deleted file mode 100644 index e77c53c7e..000000000 --- a/java/com/android/contacts/common/res/layout/select_account_list_item.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/java/com/android/contacts/common/res/layout/unread_count_tab.xml b/java/com/android/contacts/common/res/layout/unread_count_tab.xml deleted file mode 100644 index d8357f491..000000000 --- a/java/com/android/contacts/common/res/layout/unread_count_tab.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - diff --git a/java/com/android/contacts/common/res/mipmap-hdpi/ic_contacts_launcher.png b/java/com/android/contacts/common/res/mipmap-hdpi/ic_contacts_launcher.png deleted file mode 100644 index 64eff002f..000000000 Binary files a/java/com/android/contacts/common/res/mipmap-hdpi/ic_contacts_launcher.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/mipmap-mdpi/ic_contacts_launcher.png b/java/com/android/contacts/common/res/mipmap-mdpi/ic_contacts_launcher.png deleted file mode 100644 index b4ee8215a..000000000 Binary files a/java/com/android/contacts/common/res/mipmap-mdpi/ic_contacts_launcher.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/mipmap-xhdpi/ic_contacts_launcher.png b/java/com/android/contacts/common/res/mipmap-xhdpi/ic_contacts_launcher.png deleted file mode 100644 index 6feeadfbe..000000000 Binary files a/java/com/android/contacts/common/res/mipmap-xhdpi/ic_contacts_launcher.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/mipmap-xxhdpi/ic_contacts_launcher.png b/java/com/android/contacts/common/res/mipmap-xxhdpi/ic_contacts_launcher.png deleted file mode 100644 index 01a3fde9d..000000000 Binary files a/java/com/android/contacts/common/res/mipmap-xxhdpi/ic_contacts_launcher.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/mipmap-xxxhdpi/ic_contacts_launcher.png b/java/com/android/contacts/common/res/mipmap-xxxhdpi/ic_contacts_launcher.png deleted file mode 100644 index 328e067ee..000000000 Binary files a/java/com/android/contacts/common/res/mipmap-xxxhdpi/ic_contacts_launcher.png and /dev/null differ diff --git a/java/com/android/contacts/common/res/values-ja/donottranslate_config.xml b/java/com/android/contacts/common/res/values-ja/donottranslate_config.xml deleted file mode 100644 index 29512c04a..000000000 --- a/java/com/android/contacts/common/res/values-ja/donottranslate_config.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - false - - - true - - - false - - - true - - - false - \ No newline at end of file diff --git a/java/com/android/contacts/common/res/values-ko/donottranslate_config.xml b/java/com/android/contacts/common/res/values-ko/donottranslate_config.xml deleted file mode 100644 index 8def55498..000000000 --- a/java/com/android/contacts/common/res/values-ko/donottranslate_config.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - false - - - false - - - false - - - false - - - false - \ No newline at end of file diff --git a/java/com/android/contacts/common/res/values-land/integers.xml b/java/com/android/contacts/common/res/values-land/integers.xml deleted file mode 100644 index 26bac6222..000000000 --- a/java/com/android/contacts/common/res/values-land/integers.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - 3 - - - 60 - diff --git a/java/com/android/contacts/common/res/values-sw600dp-land/integers.xml b/java/com/android/contacts/common/res/values-sw600dp-land/integers.xml deleted file mode 100644 index be4eb0bb0..000000000 --- a/java/com/android/contacts/common/res/values-sw600dp-land/integers.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - 3 - - - 20 - diff --git a/java/com/android/contacts/common/res/values-sw600dp/dimens.xml b/java/com/android/contacts/common/res/values-sw600dp/dimens.xml deleted file mode 100644 index e5773b42d..000000000 --- a/java/com/android/contacts/common/res/values-sw600dp/dimens.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - @dimen/list_visible_scrollbar_padding - - 24dip - - - 32dp - - 32dp - diff --git a/java/com/android/contacts/common/res/values-sw600dp/integers.xml b/java/com/android/contacts/common/res/values-sw600dp/integers.xml deleted file mode 100644 index 31aeee995..000000000 --- a/java/com/android/contacts/common/res/values-sw600dp/integers.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 3 - - - - 15 - diff --git a/java/com/android/contacts/common/res/values-sw720dp-land/integers.xml b/java/com/android/contacts/common/res/values-sw720dp-land/integers.xml deleted file mode 100644 index 577716d24..000000000 --- a/java/com/android/contacts/common/res/values-sw720dp-land/integers.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - 4 - - - 30 - diff --git a/java/com/android/contacts/common/res/values-sw720dp/integers.xml b/java/com/android/contacts/common/res/values-sw720dp/integers.xml deleted file mode 100644 index 05e309351..000000000 --- a/java/com/android/contacts/common/res/values-sw720dp/integers.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - 2 - - - 20 - diff --git a/java/com/android/contacts/common/res/values-zh-rCN/donottranslate_config.xml b/java/com/android/contacts/common/res/values-zh-rCN/donottranslate_config.xml deleted file mode 100644 index 08023992b..000000000 --- a/java/com/android/contacts/common/res/values-zh-rCN/donottranslate_config.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - false - - - true - - - false - - - true - - - false - \ No newline at end of file diff --git a/java/com/android/contacts/common/res/values-zh-rTW/donottranslate_config.xml b/java/com/android/contacts/common/res/values-zh-rTW/donottranslate_config.xml deleted file mode 100644 index 08023992b..000000000 --- a/java/com/android/contacts/common/res/values-zh-rTW/donottranslate_config.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - false - - - true - - - false - - - true - - - false - \ No newline at end of file diff --git a/java/com/android/contacts/common/res/values/animation_constants.xml b/java/com/android/contacts/common/res/values/animation_constants.xml deleted file mode 100644 index 9eec7d6c8..000000000 --- a/java/com/android/contacts/common/res/values/animation_constants.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - 250 - diff --git a/java/com/android/contacts/common/res/values/attrs.xml b/java/com/android/contacts/common/res/values/attrs.xml deleted file mode 100644 index 44d04f025..000000000 --- a/java/com/android/contacts/common/res/values/attrs.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/java/com/android/contacts/common/res/values/colors.xml b/java/com/android/contacts/common/res/values/colors.xml deleted file mode 100644 index ab9f19b29..000000000 --- a/java/com/android/contacts/common/res/values/colors.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - #363636 - - - - #C53929 - #C2185B - #7B1FA2 - #512DA8 - #303F9F - #3367D6 - #0277BD - #006064 - #00796B - #0B8043 - #33691E - #E65100 - #E64A19 - #424242 - - - - #d1041c - - - #000000 - - - #d8d8d8 - - - #00c853 - diff --git a/java/com/android/contacts/common/res/values/dimens.xml b/java/com/android/contacts/common/res/values/dimens.xml deleted file mode 100644 index df3e53c77..000000000 --- a/java/com/android/contacts/common/res/values/dimens.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - 0dip - - - 32dip - - 18dp - 8dp - - - 32dip - - 16dip - @dimen/list_visible_scrollbar_padding - - 8dip - - 56dp - - - 16sp - 40dp - 15dp - - - 56dp - - 56dp - - 8dp - - 16dp - - 16dp - - - 2dp - - 14sp - 0dp - 16dp - 2dp - 0dp - 2dp - 12sp - 2dp - - - 48dp - - 56dp - - 16dp - - 14dp - - 15dp - - 16sp - - 2dp - - - 20dp - - 8dp - - 50dp - - 60dp - - 16sp - - 14sp - - 15dp - diff --git a/java/com/android/contacts/common/res/values/donottranslate_config.xml b/java/com/android/contacts/common/res/values/donottranslate_config.xml deleted file mode 100644 index f37e0b8d8..000000000 --- a/java/com/android/contacts/common/res/values/donottranslate_config.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - true - - - true - - - true - - - true - - - true - - - true - - - ContactEditorUtils_default_account - - - ContactEditorUtils_anything_saved - diff --git a/java/com/android/contacts/common/res/values/ids.xml b/java/com/android/contacts/common/res/values/ids.xml deleted file mode 100644 index 65969c43f..000000000 --- a/java/com/android/contacts/common/res/values/ids.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/java/com/android/contacts/common/res/values/integers.xml b/java/com/android/contacts/common/res/values/integers.xml deleted file mode 100644 index f4ed5c276..000000000 --- a/java/com/android/contacts/common/res/values/integers.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - 2 - - - 30 - - - 0 - - 0 - - - 250 - diff --git a/java/com/android/contacts/common/res/values/strings.xml b/java/com/android/contacts/common/res/values/strings.xml deleted file mode 100644 index 201128258..000000000 --- a/java/com/android/contacts/common/res/values/strings.xml +++ /dev/null @@ -1,410 +0,0 @@ - - - - - - Call - %s - - - Call home - - Call mobile - - Call work - - Call work fax - - Call home fax - - Call pager - - Call - - Call callback - - Call car - - Call company main - - Call ISDN - - Call main - - Call fax - - Call radio - - Call telex - - Call TTY/TDD - - Call work mobile - - Call work pager - - Call - %s - - - Call MMS - - - Text - %s - - - Text home - - Text mobile - - Text work - - Text work fax - - Text home fax - - Text pager - - Text - - Text callback - - Text car - - Text company main - - Text ISDN - - Text main - - Text fax - - Text radio - - Text telex - - Text TTY/TDD - - Text work mobile - - Text work pager - - Text - %s - - - Text MMS - - - Clear frequently contacted? - - - You\'ll clear the frequently contacted list in the - Contacts and Phone apps, and force email apps to learn your addressing preferences from - scratch. - - - - Clearing frequently contacted\u2026 - - - Available - - - Away - - - Busy - - - Contacts - - - Top Suggested - - - Other - - - Directory - - - Work directory - - - All contacts - - - Suggestions - - - Me - - - (No name) - - - View contact - - - All contacts with phone numbers - - - Work profile contacts - - - View updates - - - Device-only, unsynced - - - Name - - - Nickname - - - Name - - First name - - Last name - - Name prefix - - Middle name - - Name suffix - - - Phonetic name - - - Phonetic first name - - Phonetic middle name - - Phonetic last name - - - Phone - - - Email - - - Address - - - IM - - - Organization - - - Relationship - - - Special date - - - Text message - - - Address - - - Company - - - Title - - - Notes - - - SIP - - - Website - - - Groups - - - Email home - - Email mobile - - Email work - - Email - - Email %s - - - Email - - - Street - - City - - State - - ZIP code - - Country - - - View home address - - View work address - - View address - - View %s address - - - Chat using AIM - - Chat using Windows Live - - Chat using Yahoo - - Chat using Skype - - Chat using QQ - - Chat using Google Talk - - Chat using ICQ - - Chat using Jabber - - - Chat - - - All contacts - - - Contacts in %s - - - Contacts in custom view - - - Single contact - - - Clear frequents - - - stop searching - - - Clear search - - - sans-serif - - - Account - - - Always use this for calls - - - Choose SIM for this call - - - Remember this choice - - - Call with a note - - - Type a note to send with call ... - - - SEND & CALL - - - %1$s / %2$s - - - %1$s %2$s - - - %1$s tab. - - - - - %1$s tab. %2$d unread item. - - - %1$s tab. %2$d unread items. - - - - - Video call - - - Share and call - diff --git a/java/com/android/contacts/common/res/values/styles.xml b/java/com/android/contacts/common/res/values/styles.xml deleted file mode 100644 index 4f0b3f15f..000000000 --- a/java/com/android/contacts/common/res/values/styles.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/java/com/android/contacts/common/util/AccountFilterUtil.java b/java/com/android/contacts/common/util/AccountFilterUtil.java index 25f937c5e..45876354d 100644 --- a/java/com/android/contacts/common/util/AccountFilterUtil.java +++ b/java/com/android/contacts/common/util/AccountFilterUtil.java @@ -19,8 +19,8 @@ package com.android.contacts.common.util; import android.content.Context; import android.view.View; import android.widget.TextView; -import com.android.contacts.common.R; import com.android.contacts.common.list.ContactListFilter; +import com.android.dialer.contacts.resources.R; /** Utility class for account filter manipulation. */ public class AccountFilterUtil { diff --git a/java/com/android/contacts/common/util/ContactDisplayUtils.java b/java/com/android/contacts/common/util/ContactDisplayUtils.java index 967395af4..86d20bca0 100644 --- a/java/com/android/contacts/common/util/ContactDisplayUtils.java +++ b/java/com/android/contacts/common/util/ContactDisplayUtils.java @@ -27,8 +27,8 @@ import android.text.SpannableString; import android.text.TextUtils; import android.text.style.TtsSpan; import android.util.Patterns; -import com.android.contacts.common.R; import com.android.dialer.common.LogUtil; +import com.android.dialer.contacts.resources.R; import java.util.Objects; /** Methods for handling various contact data labels. */ diff --git a/java/com/android/contacts/common/util/ContactListViewUtils.java b/java/com/android/contacts/common/util/ContactListViewUtils.java index 278c27d5c..924789b16 100644 --- a/java/com/android/contacts/common/util/ContactListViewUtils.java +++ b/java/com/android/contacts/common/util/ContactListViewUtils.java @@ -19,7 +19,7 @@ package com.android.contacts.common.util; import android.content.res.Resources; import android.view.View; import android.widget.ListView; -import com.android.contacts.common.R; +import com.android.dialer.contacts.resources.R; import com.android.dialer.util.ViewUtil; /** Utilities for configuring ListViews with a card background. */ diff --git a/java/com/android/contacts/common/util/MaterialColorMapUtils.java b/java/com/android/contacts/common/util/MaterialColorMapUtils.java index bd32faa51..ea8c5fc69 100644 --- a/java/com/android/contacts/common/util/MaterialColorMapUtils.java +++ b/java/com/android/contacts/common/util/MaterialColorMapUtils.java @@ -29,9 +29,10 @@ public class MaterialColorMapUtils { public MaterialColorMapUtils(Resources resources) { sPrimaryColors = - resources.obtainTypedArray(com.android.contacts.common.R.array.letter_tile_colors); + resources.obtainTypedArray(com.android.dialer.lettertile.R.array.letter_tile_colors); sSecondaryColors = - resources.obtainTypedArray(com.android.contacts.common.R.array.letter_tile_colors_dark); + resources.obtainTypedArray( + com.android.dialer.contacts.resources.R.array.letter_tile_colors_dark); } /** diff --git a/java/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java b/java/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java index 3ee21ccea..014dcf2a1 100644 --- a/java/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java +++ b/java/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java @@ -43,8 +43,8 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.ListAdapter; import android.widget.TextView; -import com.android.contacts.common.R; import com.android.contacts.common.compat.PhoneAccountCompat; +import com.android.dialer.contacts.resources.R; import com.android.dialer.location.GeoUtil; import com.android.dialer.phonenumberutil.PhoneNumberHelper; import com.android.dialer.protos.ProtoParsers; diff --git a/java/com/android/dialer/callcomposer/CallComposerActivity.java b/java/com/android/dialer/callcomposer/CallComposerActivity.java index 921bbbaea..fc5cb22f6 100644 --- a/java/com/android/dialer/callcomposer/CallComposerActivity.java +++ b/java/com/android/dialer/callcomposer/CallComposerActivity.java @@ -611,7 +611,7 @@ public class CallComposerActivity extends AppCompatActivity TextUtils.isEmpty(contact.getNumberLabel()) ? contact.getDisplayNumber() : getString( - com.android.contacts.common.R.string.call_subject_type_and_number, + com.android.dialer.contacts.resources.R.string.call_subject_type_and_number, contact.getNumberLabel(), contact.getDisplayNumber()); numberView.setText(secondaryInfo); diff --git a/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java b/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java index 84a60c16e..f678061c8 100644 --- a/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java +++ b/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java @@ -173,7 +173,7 @@ public class CallDetailsHeaderViewHolder extends RecyclerView.ViewHolder TextUtils.isEmpty(contact.getNumberLabel()) ? contact.getDisplayNumber() : context.getString( - com.android.contacts.common.R.string.call_subject_type_and_number, + com.android.dialer.contacts.resources.R.string.call_subject_type_and_number, contact.getNumberLabel(), contact.getDisplayNumber()); numberView.setText(secondaryInfo); diff --git a/java/com/android/dialer/contacts/resources/AndroidManifest.xml b/java/com/android/dialer/contacts/resources/AndroidManifest.xml new file mode 100644 index 000000000..a1222aec0 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/AndroidManifest.xml @@ -0,0 +1,16 @@ + + diff --git a/java/com/android/dialer/contacts/resources/res/drawable-hdpi/ic_call_note_white_24dp.png b/java/com/android/dialer/contacts/resources/res/drawable-hdpi/ic_call_note_white_24dp.png new file mode 100644 index 000000000..503e58e22 Binary files /dev/null and b/java/com/android/dialer/contacts/resources/res/drawable-hdpi/ic_call_note_white_24dp.png differ diff --git a/java/com/android/dialer/contacts/resources/res/drawable-hdpi/ic_phone_attach.png b/java/com/android/dialer/contacts/resources/res/drawable-hdpi/ic_phone_attach.png new file mode 100644 index 000000000..84b1227bd Binary files /dev/null and b/java/com/android/dialer/contacts/resources/res/drawable-hdpi/ic_phone_attach.png differ diff --git a/java/com/android/dialer/contacts/resources/res/drawable-hdpi/ic_scroll_handle.png b/java/com/android/dialer/contacts/resources/res/drawable-hdpi/ic_scroll_handle.png new file mode 100644 index 000000000..3aa29b852 Binary files /dev/null and b/java/com/android/dialer/contacts/resources/res/drawable-hdpi/ic_scroll_handle.png differ diff --git a/java/com/android/dialer/contacts/resources/res/drawable-mdpi/ic_call_note_white_24dp.png b/java/com/android/dialer/contacts/resources/res/drawable-mdpi/ic_call_note_white_24dp.png new file mode 100644 index 000000000..9d359db9f Binary files /dev/null and b/java/com/android/dialer/contacts/resources/res/drawable-mdpi/ic_call_note_white_24dp.png differ diff --git a/java/com/android/dialer/contacts/resources/res/drawable-mdpi/ic_phone_attach.png b/java/com/android/dialer/contacts/resources/res/drawable-mdpi/ic_phone_attach.png new file mode 100644 index 000000000..fc4ddd32c Binary files /dev/null and b/java/com/android/dialer/contacts/resources/res/drawable-mdpi/ic_phone_attach.png differ diff --git a/java/com/android/dialer/contacts/resources/res/drawable-mdpi/ic_scroll_handle.png b/java/com/android/dialer/contacts/resources/res/drawable-mdpi/ic_scroll_handle.png new file mode 100644 index 000000000..af75db4b4 Binary files /dev/null and b/java/com/android/dialer/contacts/resources/res/drawable-mdpi/ic_scroll_handle.png differ diff --git a/java/com/android/dialer/contacts/resources/res/drawable-xhdpi/ic_call_note_white_24dp.png b/java/com/android/dialer/contacts/resources/res/drawable-xhdpi/ic_call_note_white_24dp.png new file mode 100644 index 000000000..40eed1d12 Binary files /dev/null and b/java/com/android/dialer/contacts/resources/res/drawable-xhdpi/ic_call_note_white_24dp.png differ diff --git a/java/com/android/dialer/contacts/resources/res/drawable-xhdpi/ic_phone_attach.png b/java/com/android/dialer/contacts/resources/res/drawable-xhdpi/ic_phone_attach.png new file mode 100644 index 000000000..fdfafed9a Binary files /dev/null and b/java/com/android/dialer/contacts/resources/res/drawable-xhdpi/ic_phone_attach.png differ diff --git a/java/com/android/dialer/contacts/resources/res/drawable-xhdpi/ic_scroll_handle.png b/java/com/android/dialer/contacts/resources/res/drawable-xhdpi/ic_scroll_handle.png new file mode 100644 index 000000000..2d43c4d5b Binary files /dev/null and b/java/com/android/dialer/contacts/resources/res/drawable-xhdpi/ic_scroll_handle.png differ diff --git a/java/com/android/dialer/contacts/resources/res/drawable-xxhdpi/ic_call_note_white_24dp.png b/java/com/android/dialer/contacts/resources/res/drawable-xxhdpi/ic_call_note_white_24dp.png new file mode 100644 index 000000000..2656cad18 Binary files /dev/null and b/java/com/android/dialer/contacts/resources/res/drawable-xxhdpi/ic_call_note_white_24dp.png differ diff --git a/java/com/android/dialer/contacts/resources/res/drawable-xxhdpi/ic_phone_attach.png b/java/com/android/dialer/contacts/resources/res/drawable-xxhdpi/ic_phone_attach.png new file mode 100644 index 000000000..6a6cdeeaa Binary files /dev/null and b/java/com/android/dialer/contacts/resources/res/drawable-xxhdpi/ic_phone_attach.png differ diff --git a/java/com/android/dialer/contacts/resources/res/drawable-xxhdpi/ic_scroll_handle.png b/java/com/android/dialer/contacts/resources/res/drawable-xxhdpi/ic_scroll_handle.png new file mode 100644 index 000000000..55f1d1369 Binary files /dev/null and b/java/com/android/dialer/contacts/resources/res/drawable-xxhdpi/ic_scroll_handle.png differ diff --git a/java/com/android/dialer/contacts/resources/res/drawable-xxxhdpi/ic_call_note_white_24dp.png b/java/com/android/dialer/contacts/resources/res/drawable-xxxhdpi/ic_call_note_white_24dp.png new file mode 100644 index 000000000..903c1623d Binary files /dev/null and b/java/com/android/dialer/contacts/resources/res/drawable-xxxhdpi/ic_call_note_white_24dp.png differ diff --git a/java/com/android/dialer/contacts/resources/res/drawable-xxxhdpi/ic_phone_attach.png b/java/com/android/dialer/contacts/resources/res/drawable-xxxhdpi/ic_phone_attach.png new file mode 100644 index 000000000..b072ad11f Binary files /dev/null and b/java/com/android/dialer/contacts/resources/res/drawable-xxxhdpi/ic_phone_attach.png differ diff --git a/java/com/android/dialer/contacts/resources/res/drawable-xxxhdpi/ic_scroll_handle.png b/java/com/android/dialer/contacts/resources/res/drawable-xxxhdpi/ic_scroll_handle.png new file mode 100644 index 000000000..d90782a32 Binary files /dev/null and b/java/com/android/dialer/contacts/resources/res/drawable-xxxhdpi/ic_scroll_handle.png differ diff --git a/java/com/android/dialer/contacts/resources/res/drawable/back_arrow.xml b/java/com/android/dialer/contacts/resources/res/drawable/back_arrow.xml new file mode 100644 index 000000000..34fa3d7fc --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/drawable/back_arrow.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/java/com/android/dialer/contacts/resources/res/drawable/dialog_background_material.xml b/java/com/android/dialer/contacts/resources/res/drawable/dialog_background_material.xml new file mode 100644 index 000000000..c93d43ea6 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/drawable/dialog_background_material.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/java/com/android/dialer/contacts/resources/res/drawable/fastscroll_thumb.xml b/java/com/android/dialer/contacts/resources/res/drawable/fastscroll_thumb.xml new file mode 100644 index 000000000..67645ff91 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/drawable/fastscroll_thumb.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/java/com/android/dialer/contacts/resources/res/drawable/ic_scroll_handle_default.xml b/java/com/android/dialer/contacts/resources/res/drawable/ic_scroll_handle_default.xml new file mode 100644 index 000000000..9164ab1ab --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/drawable/ic_scroll_handle_default.xml @@ -0,0 +1,20 @@ + + + + diff --git a/java/com/android/dialer/contacts/resources/res/drawable/ic_scroll_handle_pressed.xml b/java/com/android/dialer/contacts/resources/res/drawable/ic_scroll_handle_pressed.xml new file mode 100644 index 000000000..c9b93d925 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/drawable/ic_scroll_handle_pressed.xml @@ -0,0 +1,20 @@ + + + + \ No newline at end of file diff --git a/java/com/android/dialer/contacts/resources/res/drawable/ic_work_profile.xml b/java/com/android/dialer/contacts/resources/res/drawable/ic_work_profile.xml new file mode 100644 index 000000000..445288595 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/drawable/ic_work_profile.xml @@ -0,0 +1,26 @@ + + + + + + diff --git a/java/com/android/dialer/contacts/resources/res/drawable/searchedittext_custom_cursor.xml b/java/com/android/dialer/contacts/resources/res/drawable/searchedittext_custom_cursor.xml new file mode 100644 index 000000000..51e984ca0 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/drawable/searchedittext_custom_cursor.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/java/com/android/dialer/contacts/resources/res/drawable/unread_count_background.xml b/java/com/android/dialer/contacts/resources/res/drawable/unread_count_background.xml new file mode 100644 index 000000000..b58baef7c --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/drawable/unread_count_background.xml @@ -0,0 +1,21 @@ + + + + + + diff --git a/java/com/android/dialer/contacts/resources/res/layout-ldrtl/unread_count_tab.xml b/java/com/android/dialer/contacts/resources/res/layout-ldrtl/unread_count_tab.xml new file mode 100644 index 000000000..51d56bb22 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/layout-ldrtl/unread_count_tab.xml @@ -0,0 +1,48 @@ + + + + + + + + + diff --git a/java/com/android/dialer/contacts/resources/res/layout/account_filter_header.xml b/java/com/android/dialer/contacts/resources/res/layout/account_filter_header.xml new file mode 100644 index 000000000..592c240a9 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/layout/account_filter_header.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + diff --git a/java/com/android/dialer/contacts/resources/res/layout/call_subject_history_list_item.xml b/java/com/android/dialer/contacts/resources/res/layout/call_subject_history_list_item.xml new file mode 100644 index 000000000..c08327c29 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/layout/call_subject_history_list_item.xml @@ -0,0 +1,29 @@ + + + + diff --git a/java/com/android/dialer/contacts/resources/res/layout/contact_detail_list_padding.xml b/java/com/android/dialer/contacts/resources/res/layout/contact_detail_list_padding.xml new file mode 100644 index 000000000..02a5c809c --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/layout/contact_detail_list_padding.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/java/com/android/dialer/contacts/resources/res/layout/contact_list_card.xml b/java/com/android/dialer/contacts/resources/res/layout/contact_list_card.xml new file mode 100644 index 000000000..37bb8ea27 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/layout/contact_list_card.xml @@ -0,0 +1,39 @@ + + + + + + + diff --git a/java/com/android/dialer/contacts/resources/res/layout/contact_list_content.xml b/java/com/android/dialer/contacts/resources/res/layout/contact_list_content.xml new file mode 100644 index 000000000..3ee27a0ad --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/layout/contact_list_content.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + diff --git a/java/com/android/dialer/contacts/resources/res/layout/default_account_checkbox.xml b/java/com/android/dialer/contacts/resources/res/layout/default_account_checkbox.xml new file mode 100644 index 000000000..911098397 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/layout/default_account_checkbox.xml @@ -0,0 +1,50 @@ + + + + + + + /> + + + + diff --git a/java/com/android/dialer/contacts/resources/res/layout/dialog_call_subject.xml b/java/com/android/dialer/contacts/resources/res/layout/dialog_call_subject.xml new file mode 100644 index 000000000..d20aa3b45 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/layout/dialog_call_subject.xml @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/dialer/contacts/resources/res/layout/directory_header.xml b/java/com/android/dialer/contacts/resources/res/layout/directory_header.xml new file mode 100644 index 000000000..b8f5163c0 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/layout/directory_header.xml @@ -0,0 +1,55 @@ + + + + + + + + + diff --git a/java/com/android/dialer/contacts/resources/res/layout/search_bar_expanded.xml b/java/com/android/dialer/contacts/resources/res/layout/search_bar_expanded.xml new file mode 100644 index 000000000..c9ab6a92d --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/layout/search_bar_expanded.xml @@ -0,0 +1,64 @@ + + + + + + + + + + diff --git a/java/com/android/dialer/contacts/resources/res/layout/select_account_list_item.xml b/java/com/android/dialer/contacts/resources/res/layout/select_account_list_item.xml new file mode 100644 index 000000000..e77c53c7e --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/layout/select_account_list_item.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + diff --git a/java/com/android/dialer/contacts/resources/res/layout/unread_count_tab.xml b/java/com/android/dialer/contacts/resources/res/layout/unread_count_tab.xml new file mode 100644 index 000000000..d8357f491 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/layout/unread_count_tab.xml @@ -0,0 +1,43 @@ + + + + + + + diff --git a/java/com/android/dialer/contacts/resources/res/mipmap-hdpi/ic_contacts_launcher.png b/java/com/android/dialer/contacts/resources/res/mipmap-hdpi/ic_contacts_launcher.png new file mode 100644 index 000000000..64eff002f Binary files /dev/null and b/java/com/android/dialer/contacts/resources/res/mipmap-hdpi/ic_contacts_launcher.png differ diff --git a/java/com/android/dialer/contacts/resources/res/mipmap-mdpi/ic_contacts_launcher.png b/java/com/android/dialer/contacts/resources/res/mipmap-mdpi/ic_contacts_launcher.png new file mode 100644 index 000000000..b4ee8215a Binary files /dev/null and b/java/com/android/dialer/contacts/resources/res/mipmap-mdpi/ic_contacts_launcher.png differ diff --git a/java/com/android/dialer/contacts/resources/res/mipmap-xhdpi/ic_contacts_launcher.png b/java/com/android/dialer/contacts/resources/res/mipmap-xhdpi/ic_contacts_launcher.png new file mode 100644 index 000000000..6feeadfbe Binary files /dev/null and b/java/com/android/dialer/contacts/resources/res/mipmap-xhdpi/ic_contacts_launcher.png differ diff --git a/java/com/android/dialer/contacts/resources/res/mipmap-xxhdpi/ic_contacts_launcher.png b/java/com/android/dialer/contacts/resources/res/mipmap-xxhdpi/ic_contacts_launcher.png new file mode 100644 index 000000000..01a3fde9d Binary files /dev/null and b/java/com/android/dialer/contacts/resources/res/mipmap-xxhdpi/ic_contacts_launcher.png differ diff --git a/java/com/android/dialer/contacts/resources/res/mipmap-xxxhdpi/ic_contacts_launcher.png b/java/com/android/dialer/contacts/resources/res/mipmap-xxxhdpi/ic_contacts_launcher.png new file mode 100644 index 000000000..328e067ee Binary files /dev/null and b/java/com/android/dialer/contacts/resources/res/mipmap-xxxhdpi/ic_contacts_launcher.png differ diff --git a/java/com/android/dialer/contacts/resources/res/values-ja/donottranslate_config.xml b/java/com/android/dialer/contacts/resources/res/values-ja/donottranslate_config.xml new file mode 100644 index 000000000..29512c04a --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/values-ja/donottranslate_config.xml @@ -0,0 +1,33 @@ + + + + + + false + + + true + + + false + + + true + + + false + \ No newline at end of file diff --git a/java/com/android/dialer/contacts/resources/res/values-ko/donottranslate_config.xml b/java/com/android/dialer/contacts/resources/res/values-ko/donottranslate_config.xml new file mode 100644 index 000000000..8a1c2bff4 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/values-ko/donottranslate_config.xml @@ -0,0 +1,32 @@ + + + + + false + + + false + + + false + + + false + + + false + \ No newline at end of file diff --git a/java/com/android/dialer/contacts/resources/res/values-land/integers.xml b/java/com/android/dialer/contacts/resources/res/values-land/integers.xml new file mode 100644 index 000000000..26bac6222 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/values-land/integers.xml @@ -0,0 +1,22 @@ + + + + 3 + + + 60 + diff --git a/java/com/android/dialer/contacts/resources/res/values-sw600dp-land/integers.xml b/java/com/android/dialer/contacts/resources/res/values-sw600dp-land/integers.xml new file mode 100644 index 000000000..be4eb0bb0 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/values-sw600dp-land/integers.xml @@ -0,0 +1,22 @@ + + + + 3 + + + 20 + diff --git a/java/com/android/dialer/contacts/resources/res/values-sw600dp/dimens.xml b/java/com/android/dialer/contacts/resources/res/values-sw600dp/dimens.xml new file mode 100644 index 000000000..e5773b42d --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/values-sw600dp/dimens.xml @@ -0,0 +1,26 @@ + + + + @dimen/list_visible_scrollbar_padding + + 24dip + + + 32dp + + 32dp + diff --git a/java/com/android/dialer/contacts/resources/res/values-sw600dp/integers.xml b/java/com/android/dialer/contacts/resources/res/values-sw600dp/integers.xml new file mode 100644 index 000000000..31aeee995 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/values-sw600dp/integers.xml @@ -0,0 +1,24 @@ + + + + 3 + + + + 15 + diff --git a/java/com/android/dialer/contacts/resources/res/values-sw720dp-land/integers.xml b/java/com/android/dialer/contacts/resources/res/values-sw720dp-land/integers.xml new file mode 100644 index 000000000..577716d24 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/values-sw720dp-land/integers.xml @@ -0,0 +1,22 @@ + + + + 4 + + + 30 + diff --git a/java/com/android/dialer/contacts/resources/res/values-sw720dp/integers.xml b/java/com/android/dialer/contacts/resources/res/values-sw720dp/integers.xml new file mode 100644 index 000000000..05e309351 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/values-sw720dp/integers.xml @@ -0,0 +1,22 @@ + + + + 2 + + + 20 + diff --git a/java/com/android/dialer/contacts/resources/res/values-zh-rCN/donottranslate_config.xml b/java/com/android/dialer/contacts/resources/res/values-zh-rCN/donottranslate_config.xml new file mode 100644 index 000000000..2c130ba70 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/values-zh-rCN/donottranslate_config.xml @@ -0,0 +1,32 @@ + + + + + false + + + true + + + false + + + true + + + false + \ No newline at end of file diff --git a/java/com/android/dialer/contacts/resources/res/values-zh-rTW/donottranslate_config.xml b/java/com/android/dialer/contacts/resources/res/values-zh-rTW/donottranslate_config.xml new file mode 100644 index 000000000..2c130ba70 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/values-zh-rTW/donottranslate_config.xml @@ -0,0 +1,32 @@ + + + + + false + + + true + + + false + + + true + + + false + \ No newline at end of file diff --git a/java/com/android/dialer/contacts/resources/res/values/animation_constants.xml b/java/com/android/dialer/contacts/resources/res/values/animation_constants.xml new file mode 100644 index 000000000..9eec7d6c8 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/values/animation_constants.xml @@ -0,0 +1,19 @@ + + + + 250 + diff --git a/java/com/android/dialer/contacts/resources/res/values/attrs.xml b/java/com/android/dialer/contacts/resources/res/values/attrs.xml new file mode 100644 index 000000000..44d04f025 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/values/attrs.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/dialer/contacts/resources/res/values/colors.xml b/java/com/android/dialer/contacts/resources/res/values/colors.xml new file mode 100644 index 000000000..ab9f19b29 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/values/colors.xml @@ -0,0 +1,51 @@ + + + + + #363636 + + + + #C53929 + #C2185B + #7B1FA2 + #512DA8 + #303F9F + #3367D6 + #0277BD + #006064 + #00796B + #0B8043 + #33691E + #E65100 + #E64A19 + #424242 + + + + #d1041c + + + #000000 + + + #d8d8d8 + + + #00c853 + diff --git a/java/com/android/dialer/contacts/resources/res/values/dimens.xml b/java/com/android/dialer/contacts/resources/res/values/dimens.xml new file mode 100644 index 000000000..df3e53c77 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/values/dimens.xml @@ -0,0 +1,99 @@ + + + + + + 0dip + + + 32dip + + 18dp + 8dp + + + 32dip + + 16dip + @dimen/list_visible_scrollbar_padding + + 8dip + + 56dp + + + 16sp + 40dp + 15dp + + + 56dp + + 56dp + + 8dp + + 16dp + + 16dp + + + 2dp + + 14sp + 0dp + 16dp + 2dp + 0dp + 2dp + 12sp + 2dp + + + 48dp + + 56dp + + 16dp + + 14dp + + 15dp + + 16sp + + 2dp + + + 20dp + + 8dp + + 50dp + + 60dp + + 16sp + + 14sp + + 15dp + diff --git a/java/com/android/dialer/contacts/resources/res/values/donottranslate_config.xml b/java/com/android/dialer/contacts/resources/res/values/donottranslate_config.xml new file mode 100644 index 000000000..f37e0b8d8 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/values/donottranslate_config.xml @@ -0,0 +1,41 @@ + + + + + true + + + true + + + true + + + true + + + true + + + true + + + ContactEditorUtils_default_account + + + ContactEditorUtils_anything_saved + diff --git a/java/com/android/dialer/contacts/resources/res/values/ids.xml b/java/com/android/dialer/contacts/resources/res/values/ids.xml new file mode 100644 index 000000000..65969c43f --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/values/ids.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + diff --git a/java/com/android/dialer/contacts/resources/res/values/integers.xml b/java/com/android/dialer/contacts/resources/res/values/integers.xml new file mode 100644 index 000000000..f4ed5c276 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/values/integers.xml @@ -0,0 +1,35 @@ + + + + + + + 2 + + + 30 + + + 0 + + 0 + + + 250 + diff --git a/java/com/android/dialer/contacts/resources/res/values/strings.xml b/java/com/android/dialer/contacts/resources/res/values/strings.xml new file mode 100644 index 000000000..cf24a8867 --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/values/strings.xml @@ -0,0 +1,430 @@ + + + + + + Call + %s + + + Call home + + Call mobile + + Call work + + Call work fax + + Call home fax + + Call pager + + Call + + Call callback + + Call car + + Call company main + + Call ISDN + + Call main + + Call fax + + Call radio + + Call telex + + Call TTY/TDD + + Call work mobile + + Call work pager + + Call + %s + + + Call MMS + + + Text + %s + + + Text home + + Text mobile + + Text work + + Text work fax + + Text home fax + + Text pager + + Text + + Text callback + + Text car + + Text company main + + Text ISDN + + Text main + + Text fax + + Text radio + + Text telex + + Text TTY/TDD + + Text work mobile + + Text work pager + + Text + %s + + + Text MMS + + + Clear frequently contacted? + + + You\'ll clear the frequently contacted list in the + Contacts and Phone apps, and force email apps to learn your addressing preferences from + scratch. + + + + Clearing frequently contacted\u2026 + + + Available + + + Away + + + Busy + + + Contacts + + + Top Suggested + + + Other + + + Directory + + + Work directory + + + All contacts + + + Suggestions + + + Me + + + (No name) + + + View contact + + + All contacts with phone numbers + + + Work profile contacts + + + View updates + + + Device-only, unsynced + + + Name + + + Nickname + + + Name + + First name + + Last name + + Name prefix + + Middle name + + Name suffix + + + Phonetic name + + + Phonetic first name + + Phonetic middle name + + Phonetic last name + + + Phone + + + Email + + + Address + + + IM + + + Organization + + + Relationship + + + Special date + + + Text message + + + Address + + + Company + + + Title + + + Notes + + + SIP + + + Website + + + Groups + + + Email home + + Email mobile + + Email work + + Email + + Email %s + + + Email + + + Street + + City + + State + + ZIP code + + Country + + + View home address + + View work address + + View address + + View %s address + + + Chat using AIM + + Chat using Windows Live + + Chat using Yahoo + + Chat using Skype + + Chat using QQ + + Chat using Google Talk + + Chat using ICQ + + Chat using Jabber + + + Chat + + + All contacts + + + Contacts in %s + + + Contacts in custom view + + + Single contact + + + + + Sort by + + + First name + + + Last name + + + Name format + + + First name first + + + Last name first + + + Clear frequents + + + stop searching + + + Clear search + + + sans-serif + + + Account + + + Always use this for calls + + + Choose SIM for this call + + + Remember this choice + + + Call with a note + + + Type a note to send with call ... + + + SEND & CALL + + + %1$s / %2$s + + + %1$s %2$s + + + %1$s tab. + + + + + %1$s tab. %2$d unread item. + + + %1$s tab. %2$d unread items. + + + + + Video call + + + Share and call + diff --git a/java/com/android/dialer/contacts/resources/res/values/styles.xml b/java/com/android/dialer/contacts/resources/res/values/styles.xml new file mode 100644 index 000000000..4f0b3f15f --- /dev/null +++ b/java/com/android/dialer/contacts/resources/res/values/styles.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/dialer/contactsfragment/ContactsAdapter.java b/java/com/android/dialer/contactsfragment/ContactsAdapter.java index 44abe29da..5afd41f90 100644 --- a/java/com/android/dialer/contactsfragment/ContactsAdapter.java +++ b/java/com/android/dialer/contactsfragment/ContactsAdapter.java @@ -128,7 +128,8 @@ final class ContactsAdapter extends RecyclerView.Adapter