From 3bf755e71cc0c3bf680c17de8973d7a4f05dcffc Mon Sep 17 00:00:00 2001
From: calderwoodra <calderwoodra@google.com>
Date: Mon, 17 Jul 2017 15:19:50 -0700
Subject: Fixed '1' dialpad button to be aligned with '2' and '3'

The voicemail icon was rendering at 24 dp with 2dp of padding above it. Removed
the padding and reduced the icon to 16dp.

screenshots:
before: http://screen/Dx2zcVsX10y
after (portrait): http://screen/RUnQP8CR65t
after (land): http://screen/aKCdMTLkOnU
Bug: 62517731
Test: screenshots
PiperOrigin-RevId: 162278290
Change-Id: Iaaf65d9bac3920ff1755da85b6f85752654d86b8
---
 .../android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml  | 2 +-
 java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml  | 6 +++---
 java/com/android/dialer/dialpadview/res/values/dimens.xml           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'java/com/android/dialer/dialpadview')

diff --git a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml
index 6f178f0e1..135624681 100644
--- a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml
+++ b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml
@@ -35,7 +35,7 @@
       <ImageView
         android:id="@+id/dialpad_key_voicemail"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/dialpad_voicemail_icon_size"
         android:scaleType="fitCenter"
         android:src="@drawable/quantum_ic_voicemail_white_24"
         android:tint="@color/dialpad_voicemail_tint"/>
diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml
index 88594401f..4401c5bbd 100644
--- a/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml
+++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml
@@ -18,7 +18,8 @@
   android:id="@+id/one"
   style="@style/DialpadKeyButtonStyle">
   <LinearLayout
-    style="@style/DialpadKeyInternalLayoutStyle">
+      android:layout_marginTop="1dp"
+      style="@style/DialpadKeyInternalLayoutStyle">
     <com.android.dialer.dialpadview.DialpadTextView
       android:id="@+id/dialpad_key_number"
       style="@style/DialpadKeyNumberStyle"/>
@@ -28,9 +29,8 @@
       <ImageView
         android:id="@+id/dialpad_key_voicemail"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/dialpad_voicemail_icon_size"
         android:layout_centerInParent="true"
-        android:paddingTop="@dimen/dialpad_voicemail_icon_padding_top"
         android:scaleType="fitCenter"
         android:src="@drawable/quantum_ic_voicemail_white_24"
         android:tint="?attr/dialpad_voicemail_tint"/>
diff --git a/java/com/android/dialer/dialpadview/res/values/dimens.xml b/java/com/android/dialer/dialpadview/res/values/dimens.xml
index 727736497..187ec9afa 100644
--- a/java/com/android/dialer/dialpadview/res/values/dimens.xml
+++ b/java/com/android/dialer/dialpadview/res/values/dimens.xml
@@ -35,7 +35,7 @@
   <dimen name="dialpad_digits_menu_right_padding">10dp</dimen>
   <dimen name="dialpad_center_margin">3dp</dimen>
   <dimen name="dialpad_button_margin">2dp</dimen>
-  <dimen name="dialpad_voicemail_icon_padding_top">2dp</dimen>
+  <dimen name="dialpad_voicemail_icon_size">18dp</dimen>
   <dimen name="dialpad_key_button_translate_y">100dp</dimen>
   <dimen name="dialpad_overflow_margin">8dp</dimen>
   <dimen name="dialpad_space_above_keys">14dp</dimen>
-- 
cgit v1.2.3