From 30c8387f8d446b23d96bc2a99679324e9a21418f Mon Sep 17 00:00:00 2001
From: Ihab Awad <ihab@google.com>
Date: Mon, 3 Mar 2014 14:12:57 -0800
Subject: Update dialpad to new look and feel. DO NOT MERGE.

http://b/13189041

Change-Id: I26b306300e11fd6830d40b51a705c472c89925f4
(cherry picked from commit a389ad358b723ce1725662c79bfc175ddc2e558c)
---
 InCallUI/res/values/styles.xml | 49 +++++++++++++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 12 deletions(-)

(limited to 'InCallUI/res/values/styles.xml')

diff --git a/InCallUI/res/values/styles.xml b/InCallUI/res/values/styles.xml
index 91090b844..1b15d2937 100644
--- a/InCallUI/res/values/styles.xml
+++ b/InCallUI/res/values/styles.xml
@@ -131,21 +131,46 @@
         <item name="android:windowAnimationStyle">@style/InCallAnimationStyle</item>
     </style>
 
-    <style name="DialpadButtonStyle">
-        <item name="android:layout_width">0dip</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:background">?android:attr/selectableItemBackground</item>
+    <style name="DialpadKeyNumberStyle">
+        <item name="android:textColor">@color/actionbar_background_color</item>
+        <item name="android:textSize">@dimen/dialpad_key_numbers_size</item>
+        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:layout_width">@dimen/dialpad_key_numbers_width</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:gravity">center</item>
+    </style>
+
+    <style name="DialpadKeyStarPoundStyle">
+        <item name="android:textColor">@color/dialpad_secondary_text_color</item>
+        <item name="android:textSize">@dimen/dialpad_key_star_pound_size</item>
+        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:layout_width">@dimen/dialpad_key_numbers_width</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:gravity">center</item>
+    </style>
+
+    <style name="DialpadKeyLettersStyle">
+        <item name="android:textColor">@color/dialpad_secondary_text_color</item>
+        <item name="android:textSize">@dimen/dialpad_key_letters_size</item>
+        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:layout_width">@dimen/dialpad_key_letters_width</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:paddingLeft">@dimen/dialpad_number_to_letters_padding</item>
+    </style>
+
+    <style name="DialpadKeyButtonStyle">
         <item name="android:soundEffectsEnabled">false</item>
+        <item name="android:clickable">true</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/dialpad_key_height</item>
+        <item name="android:background">@drawable/dialpad_key_colors</item>
+        <item name="android:focusable">true</item>
     </style>
 
-    <style name="DialtactsDigitsTextAppearance">
-        <item name="android:maxLines">1</item>
-        <item name="android:textSize">@dimen/dialpad_digits_text_size</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:freezesText">true</item>
-        <item name="android:editable">true</item>
-        <item name="android:cursorVisible">false</item>
+    <style name="DialpadKeyInternalLayoutStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_gravity">center</item>
     </style>
 
     <style name="PrimaryCallInfoPrimaryCallBanner">
-- 
cgit v1.2.3


From c079b57fc3b5e6687d3889fcef7fba862ff64fcf Mon Sep 17 00:00:00 2001
From: Ihab Awad <ihab@google.com>
Date: Fri, 21 Mar 2014 14:55:48 -0700
Subject: DO NOT MERGE. Rearrange dialpad layout for better esthetics.

b/13551615

Change-Id: I79380c1919b0d457e5c151812146b35deb61396e

Conflicts:
	res/layout/dialpad_incall.xml
---
 InCallUI/res/values/styles.xml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'InCallUI/res/values/styles.xml')

diff --git a/InCallUI/res/values/styles.xml b/InCallUI/res/values/styles.xml
index 1b15d2937..3fb2bb28a 100644
--- a/InCallUI/res/values/styles.xml
+++ b/InCallUI/res/values/styles.xml
@@ -131,7 +131,13 @@
         <item name="android:windowAnimationStyle">@style/InCallAnimationStyle</item>
     </style>
 
-    <style name="DialpadKeyNumberStyle">
+    <style name="InCallDialpadTableRowStyle">
+        <item name="android:layout_height">0dp</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:layout_width">match_parent</item>
+    </style>
+
+    <style name="InCallDialpadKeyNumberStyle">
         <item name="android:textColor">@color/actionbar_background_color</item>
         <item name="android:textSize">@dimen/dialpad_key_numbers_size</item>
         <item name="android:fontFamily">sans-serif-light</item>
@@ -140,16 +146,15 @@
         <item name="android:gravity">center</item>
     </style>
 
-    <style name="DialpadKeyStarPoundStyle">
+    <style name="InCallDialpadKeyStarPoundStyle">
         <item name="android:textColor">@color/dialpad_secondary_text_color</item>
-        <item name="android:textSize">@dimen/dialpad_key_star_pound_size</item>
         <item name="android:fontFamily">sans-serif-light</item>
         <item name="android:layout_width">@dimen/dialpad_key_numbers_width</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:gravity">center</item>
     </style>
 
-    <style name="DialpadKeyLettersStyle">
+    <style name="InCallDialpadKeyLettersStyle">
         <item name="android:textColor">@color/dialpad_secondary_text_color</item>
         <item name="android:textSize">@dimen/dialpad_key_letters_size</item>
         <item name="android:fontFamily">sans-serif-light</item>
@@ -158,7 +163,7 @@
         <item name="android:paddingLeft">@dimen/dialpad_number_to_letters_padding</item>
     </style>
 
-    <style name="DialpadKeyButtonStyle">
+    <style name="InCallDialpadKeyButtonStyle">
         <item name="android:soundEffectsEnabled">false</item>
         <item name="android:clickable">true</item>
         <item name="android:layout_width">match_parent</item>
@@ -167,10 +172,11 @@
         <item name="android:focusable">true</item>
     </style>
 
-    <style name="DialpadKeyInternalLayoutStyle">
+    <style name="InCallDialpadKeyInternalLayoutStyle">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_gravity">center</item>
+        <item name="android:gravity">center</item>
     </style>
 
     <style name="PrimaryCallInfoPrimaryCallBanner">
-- 
cgit v1.2.3