Merge "Import translations. DO NOT MERGE"
diff --git a/res-common/drawable-hdpi/ic_menu_overflow_lt.png b/res-common/drawable-hdpi/ic_menu_overflow_lt.png
index 57db353..1ba1295 100644
--- a/res-common/drawable-hdpi/ic_menu_overflow_lt.png
+++ b/res-common/drawable-hdpi/ic_menu_overflow_lt.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
index b49522a..f271d31 100644
--- a/res-common/drawable-hdpi/ic_person_white_64dp.png
+++ b/res-common/drawable-hdpi/ic_person_white_64dp.png
Binary files differ
diff --git a/res-common/drawable-mdpi/ic_menu_overflow_lt.png b/res-common/drawable-mdpi/ic_menu_overflow_lt.png
index c699374..8415096 100644
--- a/res-common/drawable-mdpi/ic_menu_overflow_lt.png
+++ b/res-common/drawable-mdpi/ic_menu_overflow_lt.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
index dfc57ad..7f46944 100644
--- a/res-common/drawable-mdpi/ic_person_white_64dp.png
+++ b/res-common/drawable-mdpi/ic_person_white_64dp.png
Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_menu_overflow_lt.png b/res-common/drawable-xhdpi/ic_menu_overflow_lt.png
index e538b98..f91b718 100644
--- a/res-common/drawable-xhdpi/ic_menu_overflow_lt.png
+++ b/res-common/drawable-xhdpi/ic_menu_overflow_lt.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
index b506a87..298447e 100644
--- a/res-common/drawable-xhdpi/ic_person_white_64dp.png
+++ b/res-common/drawable-xhdpi/ic_person_white_64dp.png
Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_menu_overflow_lt.png b/res-common/drawable-xxhdpi/ic_menu_overflow_lt.png
index 7f3f733..ff1759b 100644
--- a/res-common/drawable-xxhdpi/ic_menu_overflow_lt.png
+++ b/res-common/drawable-xxhdpi/ic_menu_overflow_lt.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
index 026b808..fb42114 100644
--- a/res-common/drawable-xxhdpi/ic_person_white_64dp.png
+++ b/res-common/drawable-xxhdpi/ic_person_white_64dp.png
Binary files differ
diff --git a/res-common/drawable/ic_tile_letter_avatar_white.xml b/res-common/drawable/ic_tile_letter_avatar_white.xml
deleted file mode 100644
index 3b0cde2..0000000
--- a/res-common/drawable/ic_tile_letter_avatar_white.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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/values/dimens.xml b/res-common/values/dimens.xml
index 297d253..624c9ad 100644
--- a/res-common/values/dimens.xml
+++ b/res-common/values/dimens.xml
@@ -93,7 +93,6 @@
<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 -->
diff --git a/res-common/values/strings.xml b/res-common/values/strings.xml
index d82047d..b5171ec 100644
--- a/res-common/values/strings.xml
+++ b/res-common/values/strings.xml
@@ -763,8 +763,4 @@
contacts to be displayed. [CHAR LIMIT=128] -->
<string name="settings_contact_display_options_title">Contact display options</string>
- <!-- Detailed description of the preference section that allows users to configure how they
- want their contacts to be displayed. [CHAR LIMIT=128] -->
- <string name="settings_contact_display_options_description">Configure how your contacts are displayed and sorted.</string>
-
</resources>
