From 85c09468410fb87189b6e3cf55b66933ddf912d9 Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Mon, 7 Oct 2013 17:30:49 -0700
Subject: Update dialer actionbar icon and dimensions

Bug: 11118584
Change-Id: Ib582cf01ccafa86b789e74d4f722b84040c36baf
---
 res/drawable-hdpi/ic_menu_dialpad_dk.png   | Bin 1467 -> 1474 bytes
 res/drawable-mdpi/ic_menu_dialpad_dk.png   | Bin 1061 -> 1088 bytes
 res/drawable-xhdpi/ic_menu_dialpad_dk.png  | Bin 1919 -> 1957 bytes
 res/drawable-xxhdpi/ic_menu_dialpad_dk.png | Bin 2393 -> 2044 bytes
 res/layout/dialpad_fragment.xml            |   5 ++---
 res/values/dimens.xml                      |   6 ++----
 6 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/res/drawable-hdpi/ic_menu_dialpad_dk.png b/res/drawable-hdpi/ic_menu_dialpad_dk.png
index 984d6fa11..55f547750 100644
Binary files a/res/drawable-hdpi/ic_menu_dialpad_dk.png and b/res/drawable-hdpi/ic_menu_dialpad_dk.png differ
diff --git a/res/drawable-mdpi/ic_menu_dialpad_dk.png b/res/drawable-mdpi/ic_menu_dialpad_dk.png
index c55571a48..a7dcd24bf 100644
Binary files a/res/drawable-mdpi/ic_menu_dialpad_dk.png and b/res/drawable-mdpi/ic_menu_dialpad_dk.png differ
diff --git a/res/drawable-xhdpi/ic_menu_dialpad_dk.png b/res/drawable-xhdpi/ic_menu_dialpad_dk.png
index 74a7032f7..bd8085978 100644
Binary files a/res/drawable-xhdpi/ic_menu_dialpad_dk.png and b/res/drawable-xhdpi/ic_menu_dialpad_dk.png differ
diff --git a/res/drawable-xxhdpi/ic_menu_dialpad_dk.png b/res/drawable-xxhdpi/ic_menu_dialpad_dk.png
index de9387d81..09cc2f8bf 100644
Binary files a/res/drawable-xxhdpi/ic_menu_dialpad_dk.png and b/res/drawable-xxhdpi/ic_menu_dialpad_dk.png differ
diff --git a/res/layout/dialpad_fragment.xml b/res/layout/dialpad_fragment.xml
index dc2835229..32b1d6094 100644
--- a/res/layout/dialpad_fragment.xml
+++ b/res/layout/dialpad_fragment.xml
@@ -41,7 +41,7 @@
             android:id="@+id/digits_container"
             android:layout_width="match_parent"
             android:layout_height="0px"
-            android:layout_weight="@integer/dialpad_layout_weight_digits_new"
+            android:layout_weight="@integer/dialpad_layout_weight_digits"
             android:layout_marginTop="@dimen/dialpad_vertical_margin"
             android:gravity="center" >
 
@@ -81,8 +81,7 @@
         <LinearLayout
             android:id="@+id/dialButtonContainer"
             android:layout_width="match_parent"
-            android:layout_height="0px"
-            android:layout_weight="@integer/dialpad_layout_weight_additional_buttons"
+            android:layout_height="@dimen/fake_action_bar_height"
             android:layout_gravity="center_horizontal"
             android:background="@color/dialpad_primary_text_color"
             android:layoutDirection="locale">
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 30adc43ed..e4e847c32 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -47,10 +47,8 @@
     <!-- Layout weight values for dialpad screen. These layouts will be used in one
          LinearLayout (dialpad_fragment.xml), configuring dialpad screen's vertical
          ratio. -->
-    <integer name="dialpad_layout_weight_digits">20</integer>
-    <integer name="dialpad_layout_weight_digits_new">15</integer>
+    <integer name="dialpad_layout_weight_digits">15</integer>
     <integer name="dialpad_layout_weight_dialpad">65</integer>
-    <integer name="dialpad_layout_weight_additional_buttons">15</integer>
 
     <!-- Text dimensions for dialpad keys -->
     <dimen name="dialpad_key_numbers_size">40dp</dimen>
@@ -60,7 +58,7 @@
     <dimen name="dialpad_key_letters_width">41dp</dimen>
 
 
-    <dimen name="fake_action_bar_height">48dp</dimen>
+    <dimen name="fake_action_bar_height">60dp</dimen>
     <!-- Min with of fake menu buttons, which should be same as ActionBar's one -->
     <dimen name="fake_menu_button_min_width">56dp</dimen>
 
-- 
cgit v1.2.3