Merge "Import translations. DO NOT MERGE"
diff --git a/res-common/drawable-hdpi/ic_arrow_back_24dp.png b/res-common/drawable-hdpi/ic_arrow_back_24dp.png
index 86cb894..ddbb2c4 100644
--- a/res-common/drawable-hdpi/ic_arrow_back_24dp.png
+++ b/res-common/drawable-hdpi/ic_arrow_back_24dp.png
Binary files differ
diff --git a/res-common/drawable-hdpi/ic_close_dk.png b/res-common/drawable-hdpi/ic_close_dk.png
index f5e378f..9695529 100644
--- a/res-common/drawable-hdpi/ic_close_dk.png
+++ b/res-common/drawable-hdpi/ic_close_dk.png
Binary files differ
diff --git a/res-common/drawable-hdpi/ic_overflow_menu.png b/res-common/drawable-hdpi/ic_overflow_menu.png
index f21b181..262e9df 100644
--- a/res-common/drawable-hdpi/ic_overflow_menu.png
+++ b/res-common/drawable-hdpi/ic_overflow_menu.png
Binary files differ
diff --git a/res-common/drawable-mdpi/ic_arrow_back_24dp.png b/res-common/drawable-mdpi/ic_arrow_back_24dp.png
index dc81cd1..1a21fb4 100644
--- a/res-common/drawable-mdpi/ic_arrow_back_24dp.png
+++ b/res-common/drawable-mdpi/ic_arrow_back_24dp.png
Binary files differ
diff --git a/res-common/drawable-mdpi/ic_close_dk.png b/res-common/drawable-mdpi/ic_close_dk.png
index 13f68ee..590a728 100644
--- a/res-common/drawable-mdpi/ic_close_dk.png
+++ b/res-common/drawable-mdpi/ic_close_dk.png
Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_arrow_back_24dp.png b/res-common/drawable-xhdpi/ic_arrow_back_24dp.png
index 4f4fbaa..bb73272 100644
--- a/res-common/drawable-xhdpi/ic_arrow_back_24dp.png
+++ b/res-common/drawable-xhdpi/ic_arrow_back_24dp.png
Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_close_dk.png b/res-common/drawable-xhdpi/ic_close_dk.png
index 4f965fe..5769f11 100644
--- a/res-common/drawable-xhdpi/ic_close_dk.png
+++ b/res-common/drawable-xhdpi/ic_close_dk.png
Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_arrow_back_24dp.png b/res-common/drawable-xxhdpi/ic_arrow_back_24dp.png
index 46e90f7..72c51b0 100644
--- a/res-common/drawable-xxhdpi/ic_arrow_back_24dp.png
+++ b/res-common/drawable-xxhdpi/ic_arrow_back_24dp.png
Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_close_dk.png b/res-common/drawable-xxhdpi/ic_close_dk.png
index 2472da8..670bf79 100644
--- a/res-common/drawable-xxhdpi/ic_close_dk.png
+++ b/res-common/drawable-xxhdpi/ic_close_dk.png
Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_overflow_menu.png b/res-common/drawable-xxhdpi/ic_overflow_menu.png
index d0e961c..92526f5 100644
--- a/res-common/drawable-xxhdpi/ic_overflow_menu.png
+++ b/res-common/drawable-xxhdpi/ic_overflow_menu.png
Binary files differ
diff --git a/res-common/layout/dialpad.xml b/res-common/layout/dialpad.xml
index 1e7d1da..6c794a4 100644
--- a/res-common/layout/dialpad.xml
+++ b/res-common/layout/dialpad.xml
@@ -111,7 +111,7 @@
style="@style/DialpadKeyInternalLayoutStyle">
<com.android.contacts.common.dialpad.DialpadTextView
android:id="@id/dialpad_key_number"
- style="@style/DialpadKeyStarPoundStyle" />
+ style="@style/DialpadKeyStarStyle" />
</LinearLayout>
</com.android.contacts.common.dialpad.DialpadKeyButton>
<include layout="@layout/dialpad_key"
@@ -124,7 +124,7 @@
style="@style/DialpadKeyInternalLayoutStyle">
<com.android.contacts.common.dialpad.DialpadTextView
android:id="@id/dialpad_key_number"
- style="@style/DialpadKeyStarPoundStyle" />
+ style="@style/DialpadKeyPoundStyle" />
</LinearLayout>
</com.android.contacts.common.dialpad.DialpadKeyButton>
<Space style="@style/DialpadSpaceStyle" />
diff --git a/res-common/layout/dialpad_view.xml b/res-common/layout/dialpad_view.xml
index 7a33af0..7dfbff6 100644
--- a/res-common/layout/dialpad_view.xml
+++ b/res-common/layout/dialpad_view.xml
@@ -79,16 +79,11 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="#d6d6d6" />
-
- <View
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="#ffffff" />
+ android:background="#e3e3e3" />
<Space
android:layout_width="match_parent"
- android:layout_height="13dp" />
+ android:layout_height="14dp" />
<include layout="@layout/dialpad" />
diff --git a/res-common/layout/search_bar_expanded.xml b/res-common/layout/search_bar_expanded.xml
index 8bd1fff..c78ce12 100644
--- a/res-common/layout/search_bar_expanded.xml
+++ b/res-common/layout/search_bar_expanded.xml
@@ -55,6 +55,7 @@
android:src="@drawable/ic_close_dk"
android:clickable="true"
android:background="?android:attr/selectableItemBackground"
- android:contentDescription="@string/description_clear_search" />
+ android:contentDescription="@string/description_clear_search"
+ android:tint="@color/searchbox_icon_tint"/>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res-common/values/animation_constants.xml b/res-common/values/animation_constants.xml
new file mode 100644
index 0000000..9e59194
--- /dev/null
+++ b/res-common/values/animation_constants.xml
@@ -0,0 +1,19 @@
+<?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
+ -->
+<resources>
+ <integer name="floating_action_button_animation_duration">250</integer>
+</resources>
diff --git a/res-common/values/colors.xml b/res-common/values/colors.xml
index 4e5e3d3..6b31491 100644
--- a/res-common/values/colors.xml
+++ b/res-common/values/colors.xml
@@ -103,4 +103,5 @@
<color name="searchbox_background_color">#ffffff</color>
<!-- Text color of the search box hint text -->
<color name="searchbox_hint_text_color">#a4a4a4</color>
+ <color name="searchbox_icon_tint">#a4a4a4</color>
</resources>
diff --git a/res-common/values/dimens.xml b/res-common/values/dimens.xml
index a76298c..360a992 100644
--- a/res-common/values/dimens.xml
+++ b/res-common/values/dimens.xml
@@ -98,7 +98,7 @@
<!-- Corner radius of the floating action button -->
<dimen name="floating_action_button_radius">28dp</dimen>
<!-- Z translation of the floating action button -->
- <dimen name="floating_action_button_translation_z">1dp</dimen>
+ <dimen name="floating_action_button_translation_z">3dp</dimen>
<!-- Padding to be applied to the bottom of lists to make space for the floating action
button -->
<dimen name="floating_action_button_list_bottom_padding">88dp</dimen>
@@ -106,6 +106,8 @@
<dimen name="floating_action_button_margin_right">16dp</dimen>
<!-- Bottom margin of the floating action button -->
<dimen name="floating_action_button_margin_bottom">16dp</dimen>
+ <!-- Offset of bottom margin of the floating action button used when dialpad is up -->
+ <dimen name="floating_action_button_dialpad_margin_bottom_offset">4dp</dimen>
<!-- Height of the selection indicator of a tab. -->
<dimen name="tab_selected_underline_height">3dp</dimen>
@@ -116,7 +118,8 @@
<!-- Text dimensions for dialpad keys -->
<dimen name="dialpad_key_numbers_size">36sp</dimen>
<dimen name="dialpad_key_letters_size">8sp</dimen>
- <dimen name="dialpad_key_star_pound_size">23sp</dimen>
+ <dimen name="dialpad_key_pound_size">23sp</dimen>
+ <dimen name="dialpad_key_star_size">28sp</dimen>
<dimen name="dialpad_key_height">64dp</dimen>
<dimen name="dialpad_key_number_margin_bottom">2dp</dimen>
<dimen name="dialpad_symbol_margin_bottom">13dp</dimen>
diff --git a/res-common/values/styles.xml b/res-common/values/styles.xml
index 2606d5c..701bc2d 100644
--- a/res-common/values/styles.xml
+++ b/res-common/values/styles.xml
@@ -67,7 +67,7 @@
<item name="android:textColor">#888888</item>
</style>
- <style name="ListViewStyle" parent="@android:style/Widget.Holo.Light.ListView">
+ <style name="ListViewStyle" parent="@android:style/Widget.Material.Light.ListView">
<item name="android:overScrollMode">always</item>
</style>
@@ -105,9 +105,18 @@
<item name="android:gravity">center</item>
</style>
- <style name="DialpadKeyStarPoundStyle">
+ <style name="DialpadKeyStarStyle">
<item name="android:textColor">@color/dialpad_secondary_text_color</item>
- <item name="android:textSize">@dimen/dialpad_key_star_pound_size</item>
+ <item name="android:textSize">@dimen/dialpad_key_star_size</item>
+ <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_marginBottom">@dimen/dialpad_symbol_margin_bottom</item>
+ <item name="android:gravity">center</item>
+ </style>
+
+ <style name="DialpadKeyPoundStyle">
+ <item name="android:textColor">@color/dialpad_secondary_text_color</item>
+ <item name="android:textSize">@dimen/dialpad_key_pound_size</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginBottom">@dimen/dialpad_symbol_margin_bottom</item>
