diff options
author | Nancy Chen <nancychen@google.com> | 2014-05-23 18:10:23 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-23 18:10:23 +0000 |
commit | 29406c8568e69627e1559155290b4673f697d03a (patch) | |
tree | 6f8f406a81edb6cbe4d55d2cac51821080a46618 | |
parent | cc775ff7ecee94c534fbc3d8defda95a24ad08c9 (diff) | |
parent | bc4e8dfc61661246cc61bcb130ec70cbbbbec3a9 (diff) |
Merge "[DO NOT MERGE] Change icon shape and color for search shortcuts" into lmp-preview-dev
26 files changed, 72 insertions, 3 deletions
diff --git a/res/drawable-hdpi/ic_add_person_dk.png b/res/drawable-hdpi/ic_add_person_dk.png Binary files differdeleted file mode 100644 index 7096ed214..000000000 --- a/res/drawable-hdpi/ic_add_person_dk.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_phone_dk.png b/res/drawable-hdpi/ic_phone_dk.png Binary files differdeleted file mode 100644 index 984d6fa11..000000000 --- a/res/drawable-hdpi/ic_phone_dk.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_results_add_contact.png b/res/drawable-hdpi/ic_results_add_contact.png Binary files differnew file mode 100644 index 000000000..472b28104 --- /dev/null +++ b/res/drawable-hdpi/ic_results_add_contact.png diff --git a/res/drawable-hdpi/ic_results_phone.png b/res/drawable-hdpi/ic_results_phone.png Binary files differnew file mode 100644 index 000000000..3a1a7a790 --- /dev/null +++ b/res/drawable-hdpi/ic_results_phone.png diff --git a/res/drawable-hdpi/list_item_avatar_bg.png b/res/drawable-hdpi/list_item_avatar_bg.png Binary files differdeleted file mode 100644 index 66e5f3efe..000000000 --- a/res/drawable-hdpi/list_item_avatar_bg.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_add_person_dk.png b/res/drawable-mdpi/ic_add_person_dk.png Binary files differdeleted file mode 100644 index 0e0aed02c..000000000 --- a/res/drawable-mdpi/ic_add_person_dk.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_phone_dk.png b/res/drawable-mdpi/ic_phone_dk.png Binary files differdeleted file mode 100644 index c55571a48..000000000 --- a/res/drawable-mdpi/ic_phone_dk.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_results_add_contact.png b/res/drawable-mdpi/ic_results_add_contact.png Binary files differnew file mode 100644 index 000000000..d4d4759dd --- /dev/null +++ b/res/drawable-mdpi/ic_results_add_contact.png diff --git a/res/drawable-mdpi/ic_results_phone.png b/res/drawable-mdpi/ic_results_phone.png Binary files differnew file mode 100644 index 000000000..74ccf14b8 --- /dev/null +++ b/res/drawable-mdpi/ic_results_phone.png diff --git a/res/drawable-mdpi/list_item_avatar_bg.png b/res/drawable-mdpi/list_item_avatar_bg.png Binary files differdeleted file mode 100644 index 640eb3e07..000000000 --- a/res/drawable-mdpi/list_item_avatar_bg.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_add_person_dk.png b/res/drawable-xhdpi/ic_add_person_dk.png Binary files differdeleted file mode 100644 index 5211f5c92..000000000 --- a/res/drawable-xhdpi/ic_add_person_dk.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_phone_dk.png b/res/drawable-xhdpi/ic_phone_dk.png Binary files differdeleted file mode 100644 index 74a7032f7..000000000 --- a/res/drawable-xhdpi/ic_phone_dk.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_results_add_contact.png b/res/drawable-xhdpi/ic_results_add_contact.png Binary files differnew file mode 100644 index 000000000..6be67e874 --- /dev/null +++ b/res/drawable-xhdpi/ic_results_add_contact.png diff --git a/res/drawable-xhdpi/ic_results_phone.png b/res/drawable-xhdpi/ic_results_phone.png Binary files differnew file mode 100644 index 000000000..0e24fa45c --- /dev/null +++ b/res/drawable-xhdpi/ic_results_phone.png diff --git a/res/drawable-xhdpi/list_item_avatar_bg.png b/res/drawable-xhdpi/list_item_avatar_bg.png Binary files differdeleted file mode 100644 index cac7fbd34..000000000 --- a/res/drawable-xhdpi/list_item_avatar_bg.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_add_person_dk.png b/res/drawable-xxhdpi/ic_add_person_dk.png Binary files differdeleted file mode 100644 index 54ca1f063..000000000 --- a/res/drawable-xxhdpi/ic_add_person_dk.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_phone_dk.png b/res/drawable-xxhdpi/ic_phone_dk.png Binary files differdeleted file mode 100644 index de9387d81..000000000 --- a/res/drawable-xxhdpi/ic_phone_dk.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_results_add_contact.png b/res/drawable-xxhdpi/ic_results_add_contact.png Binary files differnew file mode 100644 index 000000000..3ba9093a7 --- /dev/null +++ b/res/drawable-xxhdpi/ic_results_add_contact.png diff --git a/res/drawable-xxhdpi/ic_results_phone.png b/res/drawable-xxhdpi/ic_results_phone.png Binary files differnew file mode 100644 index 000000000..9594619cb --- /dev/null +++ b/res/drawable-xxhdpi/ic_results_phone.png diff --git a/res/drawable-xxhdpi/list_item_avatar_bg.png b/res/drawable-xxhdpi/list_item_avatar_bg.png Binary files differdeleted file mode 100644 index fcfe2daaa..000000000 --- a/res/drawable-xxhdpi/list_item_avatar_bg.png +++ /dev/null diff --git a/res/drawable/ic_search_add_contact.xml b/res/drawable/ic_search_add_contact.xml new file mode 100644 index 000000000..2ec75b7f8 --- /dev/null +++ b/res/drawable/ic_search_add_contact.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_results_add_contact" + android:tint="@color/search_shortcut_icon_color" /> diff --git a/res/drawable/ic_search_phone.xml b/res/drawable/ic_search_phone.xml new file mode 100644 index 000000000..ac9053273 --- /dev/null +++ b/res/drawable/ic_search_phone.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_results_phone" + android:tint="@color/search_shortcut_icon_color" /> diff --git a/res/drawable/search_shortcut_background.xml b/res/drawable/search_shortcut_background.xml new file mode 100644 index 000000000..52b5e3f8a --- /dev/null +++ b/res/drawable/search_shortcut_background.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="oval" > + <size + android:height="@dimen/search_shortcut_radius" + android:width="@dimen/search_shortcut_radius" /> + <solid android:color="@color/search_shortcut_background_color" /> +</shape>
\ No newline at end of file diff --git a/res/values/colors.xml b/res/values/colors.xml index 5b708b66c..e0641446f 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -47,6 +47,9 @@ <!-- Background color of dialer list items (contacts, call log entries) --> <color name="background_dialer_list_items">#fbfbfb</color> + <color name="search_shortcut_background_color">#b6b6b6</color> + <color name="search_shortcut_icon_color">#f8f8f8</color> + <!-- Dark variant of the action bar color. --> <color name="actionbar_background_color_dark">#008aa1</color> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 21a35b5db..78d91c247 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -130,4 +130,7 @@ <dimen name="call_log_expanded_translation_z">4dp</dimen> <!-- Padding above call log day group headers. --> <dimen name="call_log_day_group_padding">16dp</dimen> + + <!-- Size of icon for contacts number shortcuts --> + <dimen name="search_shortcut_radius">40dp</dimen> </resources> diff --git a/src/com/android/dialer/list/DialerPhoneNumberListAdapter.java b/src/com/android/dialer/list/DialerPhoneNumberListAdapter.java index 533a13452..abceda407 100644 --- a/src/com/android/dialer/list/DialerPhoneNumberListAdapter.java +++ b/src/com/android/dialer/list/DialerPhoneNumberListAdapter.java @@ -139,16 +139,16 @@ public class DialerPhoneNumberListAdapter extends PhoneNumberListAdapter { switch (shortcutType) { case SHORTCUT_DIRECT_CALL: text = resources.getString(R.string.search_shortcut_call_number, number); - drawableId = R.drawable.ic_phone_dk; + drawableId = R.drawable.ic_search_phone; break; case SHORTCUT_ADD_NUMBER_TO_CONTACTS: text = resources.getString(R.string.search_shortcut_add_to_contacts); - drawableId = R.drawable.ic_add_person_dk; + drawableId = R.drawable.ic_search_add_contact; break; default: throw new IllegalArgumentException("Invalid shortcut type"); } - v.setDrawableResource(R.drawable.list_item_avatar_bg, drawableId); + v.setDrawableResource(R.drawable.search_shortcut_background, drawableId); v.setDisplayName(text); v.setPhotoPosition(super.getPhotoPosition()); } |