Merge "Import translations. DO NOT MERGE" into lmp-dev
diff --git a/res-common/drawable-hdpi/ic_list_item_avatar.png b/res-common/drawable-hdpi/ic_list_item_avatar.png
deleted file mode 100644
index 0a239d0..0000000
--- a/res-common/drawable-hdpi/ic_list_item_avatar.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable-hdpi/ic_person_add_24dp.png b/res-common/drawable-hdpi/ic_person_add_24dp.png
new file mode 100644
index 0000000..1b71ff1
--- /dev/null
+++ b/res-common/drawable-hdpi/ic_person_add_24dp.png
Binary files differ
diff --git a/res-common/drawable-hdpi/ic_person_white_64dp.png b/res-common/drawable-hdpi/ic_person_white_64dp.png
new file mode 100644
index 0000000..b49522a
--- /dev/null
+++ b/res-common/drawable-hdpi/ic_person_white_64dp.png
Binary files differ
diff --git a/res-common/drawable-mdpi/ic_list_item_avatar.png b/res-common/drawable-mdpi/ic_list_item_avatar.png
deleted file mode 100644
index 871212b..0000000
--- a/res-common/drawable-mdpi/ic_list_item_avatar.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable-mdpi/ic_person_add_24dp.png b/res-common/drawable-mdpi/ic_person_add_24dp.png
new file mode 100644
index 0000000..b6cf02d
--- /dev/null
+++ b/res-common/drawable-mdpi/ic_person_add_24dp.png
Binary files differ
diff --git a/res-common/drawable-mdpi/ic_person_white_64dp.png b/res-common/drawable-mdpi/ic_person_white_64dp.png
new file mode 100644
index 0000000..dfc57ad
--- /dev/null
+++ b/res-common/drawable-mdpi/ic_person_white_64dp.png
Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_list_item_avatar.png b/res-common/drawable-xhdpi/ic_list_item_avatar.png
deleted file mode 100644
index 2a73a2e..0000000
--- a/res-common/drawable-xhdpi/ic_list_item_avatar.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_person_add_24dp.png b/res-common/drawable-xhdpi/ic_person_add_24dp.png
new file mode 100644
index 0000000..2d265e1
--- /dev/null
+++ b/res-common/drawable-xhdpi/ic_person_add_24dp.png
Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_person_white_64dp.png b/res-common/drawable-xhdpi/ic_person_white_64dp.png
new file mode 100644
index 0000000..b506a87
--- /dev/null
+++ b/res-common/drawable-xhdpi/ic_person_white_64dp.png
Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_list_item_avatar.png b/res-common/drawable-xxhdpi/ic_list_item_avatar.png
deleted file mode 100644
index 5665631..0000000
--- a/res-common/drawable-xxhdpi/ic_list_item_avatar.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_person_add_24dp.png b/res-common/drawable-xxhdpi/ic_person_add_24dp.png
new file mode 100644
index 0000000..6091312
--- /dev/null
+++ b/res-common/drawable-xxhdpi/ic_person_add_24dp.png
Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_person_white_64dp.png b/res-common/drawable-xxhdpi/ic_person_white_64dp.png
new file mode 100644
index 0000000..026b808
--- /dev/null
+++ b/res-common/drawable-xxhdpi/ic_person_white_64dp.png
Binary files differ
diff --git a/res-common/drawable/ic_person_add_tinted_24dp.xml b/res-common/drawable/ic_person_add_tinted_24dp.xml
new file mode 100644
index 0000000..6d79663
--- /dev/null
+++ b/res-common/drawable/ic_person_add_tinted_24dp.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_person_add_24dp"
+ android:autoMirrored="true"
+ android:tint="@color/actionbar_icon_color" />
\ No newline at end of file
diff --git a/res-common/drawable/ic_search_add_contact.xml b/res-common/drawable/ic_search_add_contact.xml
new file mode 100644
index 0000000..36475eb
--- /dev/null
+++ b/res-common/drawable/ic_search_add_contact.xml
@@ -0,0 +1,21 @@
+<?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_person_add_24dp"
+ android:autoMirrored="true"
+ android:tint="@color/search_shortcut_icon_color" />
diff --git a/res-common/drawable/ic_tile_letter_avatar_white.xml b/res-common/drawable/ic_tile_letter_avatar_white.xml
new file mode 100644
index 0000000..3b0cde2
--- /dev/null
+++ b/res-common/drawable/ic_tile_letter_avatar_white.xml
@@ -0,0 +1,33 @@
+<?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.
+-->
+
+<!-- The avatar bitmap doesn't have a large enough border to look good inside the letter
+ tile drawable. <scale> reduces size of image bitmap in order to increase the perceived border
+ size. -->
+<scale xmlns:android="http://schemas.android.com/apk/res/android"
+ android:scaleGravity="center"
+ android:scaleHeight="@dimen/tile_letter_avatar_scale"
+ android:scaleWidth="@dimen/tile_letter_avatar_scale" >
+
+ <!-- Need to nest this inside <scale> as a separate item so that we can set the
+ "filter" value -->
+ <bitmap android:src="@drawable/ic_person_white_64dp"
+ android:filter="true"
+ android:dither="true"
+ android:tint="@color/actionbar_icon_color" />
+
+</scale>
+
diff --git a/res-common/drawable/search_shortcut_background.xml b/res-common/drawable/search_shortcut_background.xml
new file mode 100644
index 0000000..52b5e3f
--- /dev/null
+++ b/res-common/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-common/values/colors.xml b/res-common/values/colors.xml
index 8700256..76b3b9f 100644
--- a/res-common/values/colors.xml
+++ b/res-common/values/colors.xml
@@ -133,4 +133,7 @@
<!-- Text color of the search box hint text -->
<color name="searchbox_hint_text_color">#a4a4a4</color>
<color name="searchbox_icon_tint">#a4a4a4</color>
+
+ <color name="search_shortcut_background_color">#b6b6b6</color>
+ <color name="search_shortcut_icon_color">#f8f8f8</color>
</resources>
diff --git a/res-common/values/dimens.xml b/res-common/values/dimens.xml
index 2013e85..dbc9287 100644
--- a/res-common/values/dimens.xml
+++ b/res-common/values/dimens.xml
@@ -91,6 +91,7 @@
<dimen name="tile_letter_font_size">40dp</dimen>
<dimen name="tile_letter_font_size_small">20dp</dimen>
<dimen name="tile_divider_width">1dp</dimen>
+ <item name="tile_letter_avatar_scale" type="dimen">14%</item>
<item name="letter_to_tile_ratio" type="dimen">67%</item>
<!-- Height of the floating action button -->
@@ -130,4 +131,7 @@
<!-- Top margin for the Frequently Contacted section title, when the title is the first
item in the list -->
<dimen name="frequently_contacted_title_top_margin">57dp</dimen>
+
+ <!-- Size of icon for contacts number shortcuts -->
+ <dimen name="search_shortcut_radius">40dp</dimen>
</resources>
