Merge "Speed up app bar and FAB animation (2/2)" into ub-contactsdialer-f-dev
diff --git a/res-common/drawable-hdpi/ic_person_avatar.png b/res-common/drawable-hdpi/ic_person_avatar.png
new file mode 100644
index 0000000..2da477e
--- /dev/null
+++ b/res-common/drawable-hdpi/ic_person_avatar.png
Binary files differ
diff --git a/res-common/drawable-mdpi/ic_person_avatar.png b/res-common/drawable-mdpi/ic_person_avatar.png
new file mode 100644
index 0000000..31a40fb
--- /dev/null
+++ b/res-common/drawable-mdpi/ic_person_avatar.png
Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_person_avatar.png b/res-common/drawable-xhdpi/ic_person_avatar.png
new file mode 100644
index 0000000..aecc9af
--- /dev/null
+++ b/res-common/drawable-xhdpi/ic_person_avatar.png
Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_person_avatar.png b/res-common/drawable-xxhdpi/ic_person_avatar.png
new file mode 100644
index 0000000..2cfc004
--- /dev/null
+++ b/res-common/drawable-xxhdpi/ic_person_avatar.png
Binary files differ
diff --git a/res-common/drawable-xxxhdpi/ic_person_avatar.png b/res-common/drawable-xxxhdpi/ic_person_avatar.png
new file mode 100644
index 0000000..3233252
--- /dev/null
+++ b/res-common/drawable-xxxhdpi/ic_person_avatar.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
index 00005f0..fdbf4fa 100644
--- a/res-common/drawable/ic_person_add_tinted_24dp.xml
+++ b/res-common/drawable/ic_person_add_tinted_24dp.xml
@@ -16,5 +16,4 @@
-->
<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_grey" />
+ android:autoMirrored="true"/>
diff --git a/res-common/layout/search_bar_expanded.xml b/res-common/layout/search_bar_expanded.xml
index a599e4c..ecadbd1 100644
--- a/res-common/layout/search_bar_expanded.xml
+++ b/res-common/layout/search_bar_expanded.xml
@@ -26,7 +26,7 @@
android:id="@+id/search_back_button"
android:layout_width="@dimen/search_box_icon_size"
android:layout_height="@dimen/search_box_icon_size"
- android:layout_margin="@dimen/search_box_navigation_icon_margin"
+ android:layout_marginEnd="@dimen/search_box_navigation_icon_margin"
android:src="@drawable/ic_back_arrow"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_menu_back_from_search"
diff --git a/res-common/values/dimens.xml b/res-common/values/dimens.xml
index 2b45429..acfb67d 100644
--- a/res-common/values/dimens.xml
+++ b/res-common/values/dimens.xml
@@ -133,13 +133,13 @@
<!-- Padding around the icon in the search box. -->
<dimen name="search_box_icon_margin">4dp</dimen>
<!-- Size of the icon (voice search, back arrow) in the search box. -->
- <dimen name="search_box_icon_size">48dp</dimen>
+ <dimen name="search_box_icon_size">56dp</dimen>
<!-- Size of the close icon.-->
<dimen name="search_box_close_icon_size">56dp</dimen>
<!-- Padding around the close button. It's visible size without padding is 24dp. -->
<dimen name="search_box_close_icon_padding">16dp</dimen>
- <!-- Padding around back arrow icon in the search box -->
- <dimen name="search_box_navigation_icon_margin">14dp</dimen>
+ <!-- End margin of the back arrow icon in the search box -->
+ <dimen name="search_box_navigation_icon_margin">8dp</dimen>
<!-- Left margin of the text field in the search box. -->
<dimen name="search_box_text_left_margin">8dp</dimen>
<!-- Search box text size -->
@@ -147,6 +147,9 @@
<item name="close_icon_alpha" format="float" type="dimen">0.54</item>
+ <!-- Size of the close icon in selection bar.-->
+ <dimen name="selection_bar_close_icon_size">56dp</dimen>
+
<!-- Top margin for the Frequently Contacted section title -->
<dimen name="frequently_contacted_title_top_margin_when_first_row">16dp</dimen>
<!-- Top margin for the Frequently Contacted section title, when the title is the first
