Merge "Remove generic call merge button." into lmp-dev

5 files changed, 6 insertions, 30 deletions

diff --git a/res/layout-land/call_card_content.xml b/res/layout-land/call_card_content.xml
index b1b52750..f3173532 100644
--- a/res/layout-land/call_card_content.xml
+++ b/res/layout-land/call_card_content.xml
@@ -43,12 +43,15 @@
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent" >
+
             <!-- Secondary "Call info" block, for the background ("on hold") call. -->
             <include layout="@layout/secondary_call_info"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom" />
+
         </FrameLayout>
+
     </LinearLayout>
 
     <!-- Contact photo for primary call info -->
diff --git a/res/layout/call_card_content.xml b/res/layout/call_card_content.xml
index 605d6300..c45553f6 100644
--- a/res/layout/call_card_content.xml
+++ b/res/layout/call_card_content.xml
@@ -96,10 +96,7 @@
     </FrameLayout>
 
     <!-- Secondary "Call info" block, for the background ("on hold") call. -->
-    <include layout="@layout/secondary_call_info"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"/>
+    <include layout="@layout/secondary_call_info" />
 
     <!-- Placeholder for the dialpad which is replaced with the dialpad fragment when shown. -->
     <FrameLayout
diff --git a/res/layout/extra_button_row.xml b/res/layout/extra_button_row.xml
index 1bff4c55..417c4d6b 100644
--- a/res/layout/extra_button_row.xml
+++ b/res/layout/extra_button_row.xml
@@ -46,28 +46,4 @@
             android:text="@string/onscreenManageConferenceText" />
     </LinearLayout>
 
-    <!-- CDMA-specific "Merge" -->
-    <!-- This button is used only on CDMA devices, where we can't use
-         the Merge button in the main button row (because the "Add Call"
-         button might need to be enabled at the same time.) -->
-    <LinearLayout android:id="@+id/cdmaMergeButton"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="@dimen/button_cluster_horizontal_padding"
-        android:paddingEnd="@dimen/button_cluster_horizontal_padding"
-        android:background="?android:attr/selectableItemBackground"
-        android:visibility="gone">
-        <!-- The entire LinearLayout here is clickable, so we don't
-             care about clicks on the ImageButton itself. -->
-        <ImageButton android:id="@+id/cdmaMergeButtonImage"
-            android:clickable="false"
-            style="@style/InCallExtraRowButton"
-            android:src="@drawable/ic_toolbar_merge"
-            android:contentDescription="@string/onscreenMergeCallsText" />
-        <TextView android:id="@+id/cdmaMergeButtonLabel"
-            style="@style/InCallExtraRowButtonLabel"
-            android:text="@string/onscreenMergeCallsText" />
-    </LinearLayout>
-
 </FrameLayout>
diff --git a/res/layout/secondary_call_info.xml b/res/layout/secondary_call_info.xml
index cbe1fa2f..237559d4 100644
--- a/res/layout/secondary_call_info.xml
+++ b/res/layout/secondary_call_info.xml
@@ -27,7 +27,7 @@
     android:paddingTop="@dimen/call_banner_secondary_call_top_bottom_padding"
     android:paddingBottom="@dimen/call_banner_secondary_call_top_bottom_padding"
     android:background="@color/incall_banner_secondary_background_color"
-    android:elevation="@dimen/secondary_call_elevation" >
+    android:elevation="@dimen/secondary_call_elevation">
 
     <LinearLayout
         android:layout_width="0dp"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index bd2642d6..3060339a 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -62,7 +62,7 @@
     <color name="glowpad_text_widget_ring_color">#ffffff</color>
     <color name="glowpad_widget_active_color">#ffffff</color>
     <color name="glowpad_text_widget_normal_tint">#cccccc</color>
-    <color name="glowpad_call_widget_normal_tint">#00e5ff</color>
+    <color name="glowpad_call_widget_normal_tint">@color/dialtacts_theme_color</color>
     <color name="glowpad_end_call_widget_normal_tint">#ff1744</color>
     <color name="glowpad_incoming_widget_tint">#a3a3a3</color>
     <color name="glowpad_incoming_widget_background_tint">#ffffff</color>