1 files changed, 48 insertions, 2 deletions
diff --git a/res/layout-land/dialpad_fragment.xml b/res/layout-land/dialpad_fragment.xml
index 658a03b7b..0215342ae 100644
--- a/res/layout-land/dialpad_fragment.xml
+++ b/res/layout-land/dialpad_fragment.xml
@@ -57,6 +57,25 @@
                 android:contentDescription="@string/description_delete_button"
                 android:src="@drawable/ic_dial_action_delete" />
 
+            <!-- recipients replaces digits and deleteButton when
+             dial conference controls are made visible. -->
+            <EditText
+                android:id="@+id/recipients"
+                android:layout_width="0dip"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:layout_marginLeft="8dip"
+                android:autoText="true"
+                android:textSize="16sp"
+                android:hint="@string/to_hint"
+                android:minHeight="48dip"
+                android:maxLines="3"
+                android:maxLength="2000"
+                android:textColor="?android:attr/textColorPrimary"
+                android:background="@android:color/transparent"/>
+
+
 
         </LinearLayout>
         <!-- "Dialpad chooser" UI, shown only when the user brings up the
@@ -70,17 +89,32 @@
 
         <!-- Keypad section -->
         <include layout="@layout/dialpad" />
+        <View
+        android:id="@+id/dialpadStub"
+        android:layout_width="match_parent"
+        android:layout_height="0px"
+        android:layout_weight="@integer/dialpad_layout_weight_dialpad"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="@dimen/dialpad_vertical_margin"
+        android:paddingLeft="5dip"
+        android:paddingRight="5dip"
+        android:paddingBottom="10dip"
+        android:background="@drawable/dialpad_background"/>
     </LinearLayout>
     <View
        android:layout_width="@dimen/dialpad_center_margin"
        android:layout_height="match_parent"
        android:background="#66000000"/>
-    <RelativeLayout
+    <TableLayout
         android:id="@+id/dialButtonContainer"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="2"
         android:background="@drawable/dialpad_background">
+
+        <TableRow
+        android:layout_height="match_parent"
+        android:layout_weight="1">
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/dialpad_button_margin"
@@ -94,5 +128,17 @@
             android:background="@drawable/btn_call"
             android:contentDescription="@string/description_dial_button"
             android:src="@drawable/ic_dial_action_call" />
-    </RelativeLayout>
+         <!-- src for image for the button will be changed dynamically in the code.
+        See DialpadFragment.-->
+        <ImageButton
+            android:id="@+id/dialConferenceButton"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/call_button_height"
+            android:layout_alignParentBottom="true"
+            android:state_enabled="false"
+            android:background="@drawable/btn_call"
+            android:contentDescription="@string/dial_conference"
+            android:src="@drawable/ic_add_group_holo_dark" />
+        </TableRow>
+    </TableLayout>
 </LinearLayout>