Revert "Change dialpad grid and style."
This reverts commit ddfa1ea6e73541198f5f1fc33206d3d1409a9254.
Change-Id: Ia88bf58477ed3f232af335392b6d5f2c6c1a941c
diff --git a/res-common/layout/dialpad.xml b/res-common/layout/dialpad.xml
index eb7b13c..de248c6 100644
--- a/res-common/layout/dialpad.xml
+++ b/res-common/layout/dialpad.xml
@@ -15,18 +15,17 @@
-->
<!-- Dialpad in the Phone app. -->
-<LinearLayout
+<TableLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/dialpad"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:paddingLeft="5dp"
+ android:paddingRight="5dp"
+ android:stretchColumns="*"
+ android:layoutDirection="ltr" >
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
- <Space style="@style/DialpadSpaceStyle" />
+ <TableRow>
<com.android.contacts.common.dialpad.DialpadKeyButton
android:id="@+id/one"
style="@style/DialpadKeyButtonStyle">
@@ -34,18 +33,13 @@
style="@style/DialpadKeyInternalLayoutStyle">
<TextView
android:id="@+id/dialpad_key_number"
- style="@style/DialpadKeyNumberStyle" />
- <RelativeLayout
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dialpad_subtext_height" >
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/dialpad_key_voicemail"
- android:src="@drawable/ic_dial_action_vm"
- android:scaleType="fitCenter"
- android:layout_centerInParent="true" />
- </RelativeLayout>
+ style="@style/DialpadKeyNumberStyle"/>
+ <ImageView
+ android:id="@+id/dialpad_key_voicemail"
+ style="@style/DialpadKeyLettersStyle"
+ android:src="@drawable/ic_dial_action_vm"
+ android:scaleType="fitStart"
+ android:baselineAlignBottom="true" />
</LinearLayout>
</com.android.contacts.common.dialpad.DialpadKeyButton>
<include layout="@layout/dialpad_key"
@@ -54,14 +48,9 @@
<include layout="@layout/dialpad_key"
android:id="@+id/three"
style="@style/DialpadKeyButtonStyle" />
- <Space style="@style/DialpadSpaceStyle" />
- </LinearLayout>
+ </TableRow>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
- <Space style="@style/DialpadSpaceStyle" />
+ <TableRow>
<include layout="@layout/dialpad_key"
android:id="@+id/four"
style="@style/DialpadKeyButtonStyle" />
@@ -71,14 +60,9 @@
<include layout="@layout/dialpad_key"
android:id="@+id/six"
style="@style/DialpadKeyButtonStyle" />
- <Space style="@style/DialpadSpaceStyle" />
- </LinearLayout>
+ </TableRow>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
- <Space style="@style/DialpadSpaceStyle" />
+ <TableRow>
<include layout="@layout/dialpad_key"
android:id="@+id/seven"
style="@style/DialpadKeyButtonStyle" />
@@ -88,14 +72,9 @@
<include layout="@layout/dialpad_key"
android:id="@+id/nine"
style="@style/DialpadKeyButtonStyle" />
- <Space style="@style/DialpadSpaceStyle" />
- </LinearLayout>
+ </TableRow>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
- <Space style="@style/DialpadSpaceStyle" />
+ <TableRow>
<com.android.contacts.common.dialpad.DialpadKeyButton
android:id="@+id/star"
style="@style/DialpadKeyButtonStyle">
@@ -104,6 +83,9 @@
<TextView
android:id="@id/dialpad_key_number"
style="@style/DialpadKeyStarPoundStyle" />
+ <View
+ android:layout_height="match_parent"
+ android:layout_width="@dimen/dialpad_key_letters_width" />
</LinearLayout>
</com.android.contacts.common.dialpad.DialpadKeyButton>
<include layout="@layout/dialpad_key"
@@ -117,31 +99,35 @@
<TextView
android:id="@id/dialpad_key_number"
style="@style/DialpadKeyStarPoundStyle" />
+ <View
+ android:layout_height="match_parent"
+ android:layout_width="@dimen/dialpad_key_letters_width" />
</LinearLayout>
</com.android.contacts.common.dialpad.DialpadKeyButton>
- <Space style="@style/DialpadSpaceStyle" />
- </LinearLayout>
+ </TableRow>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
+ <TableRow>
<FrameLayout
android:id="@+id/dialpad_add_contact"
android:contentDescription="@string/description_add_contact"
style="@style/DialpadBottomKeyButtonStyle"
- android:visibility="invisible" >
+ android:visibility="invisible"
+ >
<ImageView
android:src="@drawable/ic_add_person_dk"
android:importantForAccessibility="no"
android:paddingRight="@dimen/dialpad_key_letters_width"
- style="@style/DialpadKeyInternalLayoutStyle" />
+ style="@style/DialpadKeyInternalLayoutStyle"
+ />
</FrameLayout>
- <Space style="@style/DialpadBottomKeyButtonStyle" />
+ <Space
+ style="@style/DialpadBottomKeyButtonStyle"
+ />
<FrameLayout
android:id="@+id/dialpad_overflow"
android:contentDescription="@string/description_dialpad_overflow"
- style="@style/DialpadBottomKeyButtonStyle" >
+ style="@style/DialpadBottomKeyButtonStyle"
+ >
<ImageView
android:src="@drawable/ic_overflow_menu"
android:importantForAccessibility="no"
@@ -149,5 +135,5 @@
style="@style/DialpadKeyInternalLayoutStyle"
/>
</FrameLayout>
- </LinearLayout>
-</LinearLayout>
+ </TableRow>
+</TableLayout>
diff --git a/res-common/values/colors.xml b/res-common/values/colors.xml
index 6e06362..9474400 100644
--- a/res-common/values/colors.xml
+++ b/res-common/values/colors.xml
@@ -80,13 +80,16 @@
actionbar_background_color. -->
<color name="actionbar_background_color">#00afcc</color>
-
- <!-- Colors for the dialpad -->
+ <!-- Background color of dialpad -->
<color name="background_dialpad">#ffffff</color>
+ <!-- Pressed color of dialpad buttons -->
<color name="background_dialpad_pressed">#ececec</color>
- <color name="dialpad_primary_text_color">#26c6da</color>
- <!-- Secondary color of dialpad text; black at 40% opacity. -->
- <color name="dialpad_secondary_text_color">#66000000</color>
+ <!-- Primary color of dialpad text, including the call button -->
+ <color name="dialpad_primary_text_color">#3B77E7</color>
+ <!-- Secondary color of dialpad text (used for the letters corresponding to each digit -->
+ <color name="dialpad_secondary_text_color">#8b8b8b</color>
+ <!-- Color of dialpad digits -->
<color name="dialpad_digits_text_color">#000000</color>
+ <!-- Color for dialpad separator lines -->
<color name="dialpad_separator_line_color">#dadada</color>
</resources>
diff --git a/res-common/values/dimens.xml b/res-common/values/dimens.xml
index 8a3bcb5..374b4a1 100644
--- a/res-common/values/dimens.xml
+++ b/res-common/values/dimens.xml
@@ -103,14 +103,16 @@
<dimen name="tab_selected_underline_height">3dp</dimen>
<!-- Text dimensions for dialpad keys -->
- <dimen name="dialpad_key_numbers_size">34sp</dimen>
- <dimen name="dialpad_key_letters_size">8sp</dimen>
- <dimen name="dialpad_key_star_pound_size">23sp</dimen>
- <dimen name="dialpad_key_height">64sp</dimen>
- <dimen name="dialpad_subtext_height">10dp</dimen>
+ <dimen name="dialpad_key_numbers_size">40sp</dimen>
+ <dimen name="dialpad_key_letters_size">13sp</dimen>
+ <dimen name="dialpad_key_star_pound_size">26sp</dimen>
+ <dimen name="dialpad_key_numbers_width">30dp</dimen>
+ <dimen name="dialpad_key_letters_width">50dp</dimen>
+ <dimen name="dialpad_key_height">56sp</dimen>
<!-- The bottom row of the dialpad is slightly taller to account for the dial button -->
<dimen name="dialpad_bottom_key_height">70dp</dimen>
<dimen name="dialpad_key_plus_size">18sp</dimen>
+ <dimen name="dialpad_number_to_letters_padding">11dp</dimen>
<dimen name="dialpad_horizontal_padding">5dp</dimen>
<dimen name="dialpad_digits_text_size">33sp</dimen>
<dimen name="dialpad_digits_height">55dp</dimen>
diff --git a/res-common/values/styles.xml b/res-common/values/styles.xml
index 9fca1f2..ebc7109 100644
--- a/res-common/values/styles.xml
+++ b/res-common/values/styles.xml
@@ -89,17 +89,11 @@
<item name="android:windowIsFloating">true</item>
</style>
- <style name="DialpadSpaceStyle">
- <item name="android:layout_width">0dp</item>
- <item name="android:layout_height">@dimen/dialpad_key_height</item>
- <item name="android:layout_weight">3</item>
- </style>
-
- <style name="DialpadKeyNumberStyle">
- <item name="android:textColor">@color/dialpad_primary_text_color</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">match_parent</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>
@@ -107,27 +101,26 @@
<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:layout_width">wrap_content</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:layout_marginBottom">@dimen/dialpad_subtext_height</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-medium</item>
- <item name="android:layout_width">match_parent</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:gravity">center</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">0dp</item>
+ <item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">@dimen/dialpad_key_height</item>
- <item name="android:layout_weight">13</item>
<item name="android:background">@drawable/dialpad_key_colors</item>
<item name="android:focusable">true</item>
</style>
@@ -140,6 +133,5 @@
<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:orientation">vertical</item>
</style>
</resources>