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/layout/dialpad_incall.xml | 79 ++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 InCallUI/res/layout/dialpad_incall.xml

(limited to 'InCallUI/res/layout/dialpad_incall.xml')

diff --git a/InCallUI/res/layout/dialpad_incall.xml b/InCallUI/res/layout/dialpad_incall.xml
new file mode 100644
index 000000000..d74b9f4a3
--- /dev/null
+++ b/InCallUI/res/layout/dialpad_incall.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<TableLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/dialpad"
+    android:layout_width="match_parent"
+    android:layout_height="0dp"
+    android:layout_weight="4"
+    android:layout_gravity="center_horizontal"
+    android:paddingLeft="@dimen/dialpad_horizontal_padding"
+    android:paddingRight="@dimen/dialpad_horizontal_padding"
+    android:background="@color/background_dialpad"
+    android:stretchColumns="*"
+    android:layoutDirection="ltr" >
+
+    <TableRow style="@style/InCallDialpadTableRowStyle">
+        <include layout="@layout/dialpad_key_incall" android:id="@+id/one"/>
+        <include layout="@layout/dialpad_key_incall" android:id="@+id/two"/>
+        <include layout="@layout/dialpad_key_incall" android:id="@+id/three"/>
+    </TableRow>
+
+    <TableRow style="@style/InCallDialpadTableRowStyle">
+        <include layout="@layout/dialpad_key_incall" android:id="@+id/four"/>
+        <include layout="@layout/dialpad_key_incall" android:id="@+id/five"/>
+        <include layout="@layout/dialpad_key_incall" android:id="@+id/six"/>
+    </TableRow>
+
+    <TableRow style="@style/InCallDialpadTableRowStyle">
+        <include layout="@layout/dialpad_key_incall" android:id="@+id/seven"/>
+        <include layout="@layout/dialpad_key_incall" android:id="@+id/eight"/>
+        <include layout="@layout/dialpad_key_incall" android:id="@+id/nine"/>
+    </TableRow>
+
+    <TableRow style="@style/InCallDialpadTableRowStyle">
+        <com.android.dialer.dialpad.DialpadKeyButton
+            android:id="@+id/star"
+            style="@style/InCallDialpadKeyButtonStyle">
+            <LinearLayout
+                style="@style/InCallDialpadKeyInternalLayoutStyle">
+                <TextView
+                    android:id="@id/dialpad_key_number"
+                    style="@style/InCallDialpadKeyStarPoundStyle"
+                    android:textSize="@dimen/dialpad_key_star_size" />
+                <View
+                    android:layout_height="match_parent"
+                    android:layout_width="@dimen/dialpad_key_letters_width" />
+            </LinearLayout>
+        </com.android.dialer.dialpad.DialpadKeyButton>
+        <include layout="@layout/dialpad_key_incall" android:id="@+id/zero"/>
+        <com.android.dialer.dialpad.DialpadKeyButton
+            android:id="@+id/pound"
+            style="@style/InCallDialpadKeyButtonStyle">
+            <LinearLayout
+                style="@style/InCallDialpadKeyInternalLayoutStyle">
+                <TextView
+                    android:id="@id/dialpad_key_number"
+                    style="@style/InCallDialpadKeyStarPoundStyle"
+                    android:textSize="@dimen/dialpad_key_pound_size" />
+                <View
+                    android:layout_height="match_parent"
+                    android:layout_width="@dimen/dialpad_key_letters_width" />
+            </LinearLayout>
+        </com.android.dialer.dialpad.DialpadKeyButton>
+    </TableRow>
+</TableLayout>
-- 
cgit v1.2.3


From 43242b3fd5c4081d3d826802481d3066d4839343 Mon Sep 17 00:00:00 2001
From: Ihab Awad <ihab@google.com>
Date: Fri, 21 Mar 2014 20:24:14 -0700
Subject: DO NOT MERGE. Fix build breakage: Fix an ID syntax error.

Change-Id: If590c3a9487b642069b72fcbc5acb8c3894a28f6
---
 InCallUI/res/layout/dialpad_incall.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'InCallUI/res/layout/dialpad_incall.xml')

diff --git a/InCallUI/res/layout/dialpad_incall.xml b/InCallUI/res/layout/dialpad_incall.xml
index d74b9f4a3..d9473c1c6 100644
--- a/InCallUI/res/layout/dialpad_incall.xml
+++ b/InCallUI/res/layout/dialpad_incall.xml
@@ -52,7 +52,7 @@
             <LinearLayout
                 style="@style/InCallDialpadKeyInternalLayoutStyle">
                 <TextView
-                    android:id="@id/dialpad_key_number"
+                    android:id="@+id/dialpad_key_number"
                     style="@style/InCallDialpadKeyStarPoundStyle"
                     android:textSize="@dimen/dialpad_key_star_size" />
                 <View
@@ -67,7 +67,7 @@
             <LinearLayout
                 style="@style/InCallDialpadKeyInternalLayoutStyle">
                 <TextView
-                    android:id="@id/dialpad_key_number"
+                    android:id="@+id/dialpad_key_number"
                     style="@style/InCallDialpadKeyStarPoundStyle"
                     android:textSize="@dimen/dialpad_key_pound_size" />
                 <View
-- 
cgit v1.2.3