Dialpad pixel perfect.
Bug: 5085854
Change-Id: I8f3aeadbe35ba3d4513b5dc68ee1a69f5712fe7b
diff --git a/res/layout/dialpad.xml b/res/layout/dialpad.xml
index e9a95ee..1f74c26 100644
--- a/res/layout/dialpad.xml
+++ b/res/layout/dialpad.xml
@@ -19,13 +19,18 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/dialpad"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="0px"
+ android:layout_weight="0.650"
android:layout_gravity="center_horizontal"
- android:layout_marginTop="4dip"
- android:background="@drawable/dialpad_background"
- android:layout_weight="1">
+ android:layout_marginTop="@dimen/dialpad_vertical_margin"
+ android:paddingLeft="5dip"
+ android:paddingRight="5dip"
+ android:paddingBottom="10dip"
+ android:background="@drawable/dialpad_background">
- <TableRow>
+ <TableRow
+ android:layout_height="0px"
+ android:layout_weight="1">
<ImageButton android:id="@+id/one" style="@style/DialtactsDialpadButtonStyle"
android:src="@drawable/dial_num_1"
android:contentDescription="@string/description_image_button_one" />
@@ -37,7 +42,9 @@
android:contentDescription="@string/description_image_button_three" />
</TableRow>
- <TableRow>
+ <TableRow
+ android:layout_height="0px"
+ android:layout_weight="1">
<ImageButton android:id="@+id/four" style="@style/DialtactsDialpadButtonStyle"
android:src="@drawable/dial_num_4"
android:contentDescription="@string/description_image_button_four" />
@@ -49,7 +56,9 @@
android:contentDescription="@string/description_image_button_six" />
</TableRow>
- <TableRow>
+ <TableRow
+ android:layout_height="0px"
+ android:layout_weight="1">
<ImageButton android:id="@+id/seven" style="@style/DialtactsDialpadButtonStyle"
android:src="@drawable/dial_num_7"
android:contentDescription="@string/description_image_button_seven" />
@@ -61,7 +70,9 @@
android:contentDescription="@string/description_image_button_nine" />
</TableRow>
- <TableRow>
+ <TableRow
+ android:layout_height="0px"
+ android:layout_weight="1">
<ImageButton android:id="@+id/star" style="@style/DialtactsDialpadButtonStyle"
android:src="@drawable/dial_num_star"
android:contentDescription="@string/description_image_button_star" />
@@ -71,6 +82,5 @@
<ImageButton android:id="@+id/pound" style="@style/DialtactsDialpadButtonStyle"
android:src="@drawable/dial_num_pound"
android:contentDescription="@string/description_image_button_pound" />
-
</TableRow>
</TableLayout>
diff --git a/res/layout/dialpad_additional_buttons.xml b/res/layout/dialpad_additional_buttons.xml
index 47a578e..a5e247b 100644
--- a/res/layout/dialpad_additional_buttons.xml
+++ b/res/layout/dialpad_additional_buttons.xml
@@ -18,11 +18,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/dialpadAdditionalButtons"
android:layout_width="match_parent"
- android:layout_height="@dimen/dialpad_additional_buttons_height"
+ android:layout_height="0px"
+ android:layout_weight="0.150"
android:layout_gravity="center_horizontal"
- android:layout_marginTop="4dip"
- android:layout_marginBottom="4dip"
- android:layout_weight="0.25"
+ android:layout_marginTop="@dimen/dialpad_vertical_margin"
android:background="@drawable/dialpad_background"
android:orientation="horizontal">
diff --git a/res/layout/dialpad_fragment.xml b/res/layout/dialpad_fragment.xml
index 864dcc7..90d2593 100644
--- a/res/layout/dialpad_fragment.xml
+++ b/res/layout/dialpad_fragment.xml
@@ -19,15 +19,16 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:paddingLeft="4dip"
- android:paddingRight="4dip">
+ android:paddingLeft="@dimen/dialpad_horizontal_margin"
+ android:paddingRight="@dimen/dialpad_horizontal_margin">
<!-- Text field and possibly soft menu button above the keypad where
the digits are displayed. -->
<RelativeLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/dialpad_digits_height"
- android:layout_marginTop="4dip"
+ android:layout_height="0px"
+ android:layout_weight="0.200"
+ android:layout_marginTop="@dimen/dialpad_vertical_margin"
android:gravity="center" >
<!-- Type of this EditText is set to NULL (to disable the IME keyboard)
@@ -45,10 +46,11 @@
android:textColor="?android:attr/textColorPrimary" />
<ImageButton android:id="@+id/overflow_menu"
- android:layout_width="wrap_content"
+ android:layout_width="48dip"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
- android:src="@drawable/ic_menu_overflow" />
+ android:src="@drawable/ic_menu_overflow"
+ android:background="@android:color/transparent"/>
</RelativeLayout>