commit d5fe2029b5ac39b8975b800f61ad022f40ce61f4
author Wenyi Wang <wenyiw@google.com> Sun Jul 24 02:00:46 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun Jul 24 02:00:47 2016 +0000
tree 496dc06a52ad472124c9afeea0a52bb07636ac7d
parent e673391a26efe4dab541838bb7ef664b766b4438
parent bd114976b35ae18c8f3544f74b75fe33a8f6ee01

Merge "Speed up app bar and FAB animation (1/2)" into ub-contactsdialer-f-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 51c10a4..842d1b7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,8 +16,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.contacts"
-    android:versionCode="10507"
-    android:versionName="1.5.7">
+    android:versionCode="10508"
+    android:versionName="1.5.8">
 
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="25" />
 

res/layout/selection_bar.xml

diff --git a/res/layout/selection_bar.xml b/res/layout/selection_bar.xml
index c2521d1..72a5a10 100644
--- a/res/layout/selection_bar.xml
+++ b/res/layout/selection_bar.xml
@@ -22,8 +22,8 @@
 
     <ImageButton
         android:id="@+id/selection_close"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
+        android:layout_width="@dimen/selection_bar_close_icon_size"
+        android:layout_height="@dimen/selection_bar_close_icon_size"
         android:layout_gravity="center_vertical|start"
         android:alpha="@dimen/close_icon_alpha"
         android:background="?attr/selectableItemBackgroundBorderless"