Move "manage conference calls" button above photo.

- Remove it from the CallButtonFragment. This meant that related
logic was removed from CallButtonFragment/Presenter, and similar
logic was added to the CallCardFragment/Presenter.
- Delete old groups icons. (new ones added in ContactsCommon)
- Delete the extra_button_row logic.
+ Replace extra_button_row with a dedicated "manage conference
calls" button, and added to call card content layouts.
+ Style the new button to be similar to the secondary call info.

Bug: 15862303
Change-Id: I2b4e1a3a30422c7d5e9c01479f13291a785d85f3

14 files changed, 58 insertions, 87 deletions

diff --git a/InCallUI/res/drawable-hdpi/ic_groups_holo_dark.png b/InCallUI/res/drawable-hdpi/ic_groups_holo_dark.png
deleted file mode 100644
index 6194506d4..000000000
--- a/InCallUI/res/drawable-hdpi/ic_groups_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-ldrtl-hdpi/ic_groups_holo_dark.png b/InCallUI/res/drawable-ldrtl-hdpi/ic_groups_holo_dark.png
deleted file mode 100644
index 185c55bab..000000000
--- a/InCallUI/res/drawable-ldrtl-hdpi/ic_groups_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-ldrtl-mdpi/ic_groups_holo_dark.png b/InCallUI/res/drawable-ldrtl-mdpi/ic_groups_holo_dark.png
deleted file mode 100644
index 844bed3f0..000000000
--- a/InCallUI/res/drawable-ldrtl-mdpi/ic_groups_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-ldrtl-xhdpi/ic_groups_holo_dark.png b/InCallUI/res/drawable-ldrtl-xhdpi/ic_groups_holo_dark.png
deleted file mode 100644
index 38ea395c5..000000000
--- a/InCallUI/res/drawable-ldrtl-xhdpi/ic_groups_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-mdpi/ic_groups_holo_dark.png b/InCallUI/res/drawable-mdpi/ic_groups_holo_dark.png
deleted file mode 100644
index fefee322e..000000000
--- a/InCallUI/res/drawable-mdpi/ic_groups_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xhdpi/ic_groups_holo_dark.png b/InCallUI/res/drawable-xhdpi/ic_groups_holo_dark.png
deleted file mode 100644
index 470ca2795..000000000
--- a/InCallUI/res/drawable-xhdpi/ic_groups_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xxhdpi/ic_groups_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_groups_holo_dark.png
deleted file mode 100644
index 6fdaa5d35..000000000
--- a/InCallUI/res/drawable-xxhdpi/ic_groups_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/layout-land/call_card_content.xml b/InCallUI/res/layout-land/call_card_content.xml
index f3173532f..ddcd40342 100644
--- a/InCallUI/res/layout-land/call_card_content.xml
+++ b/InCallUI/res/layout-land/call_card_content.xml
@@ -65,6 +65,11 @@
         android:contentDescription="@string/contactPhoto"
         android:src="@drawable/picture_unknown" />
 
+    <include layout="@layout/manage_conference_call_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/photo" />
+
     <fragment android:name="com.android.incallui.VideoCallFragment"
         android:layout_alignParentStart="true"
         android:layout_gravity="start|center_vertical"
diff --git a/InCallUI/res/layout/call_button_fragment.xml b/InCallUI/res/layout/call_button_fragment.xml
index 6b7e17aa9..aa87d0c1a 100644
--- a/InCallUI/res/layout/call_button_fragment.xml
+++ b/InCallUI/res/layout/call_button_fragment.xml
@@ -40,17 +40,6 @@
     android:animateLayoutChanges="true"
     android:visibility="invisible" >
 
-    <!-- Row 1, the "extra button row": A couple of relatively rare
-         buttons used only in certain call states.
-         Most of the time this whole row is GONE.
-         For now, at least, there's only ever one button visible here
-         at a time, so this can be a simple FrameLayout. -->
-    <include android:id="@+id/extraButtonRow"
-        layout="@layout/extra_button_row"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-    <!-- Row 2: The main batch of in-call buttons. -->
     <LinearLayout
         android:orientation="horizontal"
         android:layout_width="match_parent"
diff --git a/InCallUI/res/layout/call_card_content.xml b/InCallUI/res/layout/call_card_content.xml
index c45553f6d..6d0ee8802 100644
--- a/InCallUI/res/layout/call_card_content.xml
+++ b/InCallUI/res/layout/call_card_content.xml
@@ -55,6 +55,7 @@
             android:visibility="gone"
             android:padding="@dimen/call_banner_side_padding"
             android:background="@android:color/white" />
+
     </LinearLayout>
 
     <!-- Contact photo for primary call info -->
@@ -98,6 +99,11 @@
     <!-- Secondary "Call info" block, for the background ("on hold") call. -->
     <include layout="@layout/secondary_call_info" />
 
+    <include layout="@layout/manage_conference_call_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/photo" />
+
     <!-- Placeholder for the dialpad which is replaced with the dialpad fragment when shown. -->
     <FrameLayout
         android:id="@+id/dialpadFragmentContainer"
diff --git a/InCallUI/res/layout/extra_button_row.xml b/InCallUI/res/layout/extra_button_row.xml
deleted file mode 100644
index 417c4d6b9..000000000
--- a/InCallUI/res/layout/extra_button_row.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2013 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
-  -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/button_background_color">
-    <!-- The buttons here have a text label floating off to the side
-         (which is necessary because these buttons are used only in
-         a few rare states, and the meaning of the icon might not be
-         obvious.)  The entire row (button + text) is clickable. -->
-
-    <!-- "Manage conference" -->
-    <!-- This button is used only on GSM devices, during a conference call. -->
-    <LinearLayout android:id="@+id/manageConferenceButton"
-        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/manageConferenceButtonImage"
-            android:clickable="false"
-            style="@style/InCallExtraRowButton"
-            android:src="@drawable/ic_groups_holo_dark"
-            android:contentDescription="@string/onscreenManageConferenceText" />
-        <TextView android:id="@+id/manageConferenceButtonLabel"
-            style="@style/InCallExtraRowButtonLabel"
-            android:text="@string/onscreenManageConferenceText" />
-    </LinearLayout>
-
-</FrameLayout>
diff --git a/InCallUI/res/layout/manage_conference_call_button.xml b/InCallUI/res/layout/manage_conference_call_button.xml
new file mode 100644
index 000000000..d8ddf2189
--- /dev/null
+++ b/InCallUI/res/layout/manage_conference_call_button.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2013 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
+  -->
+
+<!-- This button is used only on GSM devices, during a conference call. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/manage_conference_call_button"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:paddingStart="@dimen/call_banner_side_padding"
+    android:paddingEnd="@dimen/secondary_call_banner_right_padding"
+    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">
+
+    <!-- The entire LinearLayout here is clickable, so we ignore ImageButton clicks. -->
+    <ImageView android:id="@+id/manageConferenceButtonImage"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_group_white_24dp"
+        android:tint="@color/incall_banner_secondary_text_color"
+        android:contentDescription="@string/onscreenManageConferenceText" />
+
+    <TextView android:id="@+id/manageConferenceButtonLabel"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="24dp"
+        android:gravity="center_vertical"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="@color/incall_banner_secondary_text_color"
+        android:text="@string/onscreenManageConferenceText" />
+
+</LinearLayout>
diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml
index 6bf80f314..8648c8c13 100644
--- a/InCallUI/res/values/dimens.xml
+++ b/InCallUI/res/values/dimens.xml
@@ -50,12 +50,6 @@
     <!-- Height and width of the in-call buttons. -->
     <dimen name="in_call_button_dimension">48dp</dimen>
 
-    <!-- Width of buttons in the extra button row. -->
-    <dimen name="extra_row_button_width">56dp</dimen>
-
-    <!-- Height of buttons in the extra button row. -->
-    <dimen name="extra_row_button_height">@dimen/in_call_button_dimension</dimen>
-
     <dimen name="primary_call_elevation">4dp</dimen>
     <dimen name="secondary_call_elevation">4dp</dimen>
 
diff --git a/InCallUI/res/values/styles.xml b/InCallUI/res/values/styles.xml
index 06aeb8738..f49cee910 100644
--- a/InCallUI/res/values/styles.xml
+++ b/InCallUI/res/values/styles.xml
@@ -70,27 +70,6 @@
         <item name="android:textOff">@null</item>
     </style>
 
-    <!-- Buttons in extra button row. -->
-    <style name="InCallExtraRowButton">
-        <item name="android:layout_width">@dimen/extra_row_button_width</item>
-        <item name="android:layout_height">@dimen/extra_row_button_height</item>
-        <item name="android:background">@null</item>
-    </style>
-
-    <!-- Text label drawn alongside buttons in the "extra button row" of
-         the in-call onscreen touch UI. -->
-    <style name="InCallExtraRowButtonLabel">
-        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
-        <item name="android:textColor">@color/incall_call_banner_text_color</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_gravity">center_vertical</item>
-        <item name="android:layout_marginStart">5dip</item>
-        <item name="android:layout_marginEnd">5dip</item>
-    </style>
-
     <style name="InCallAnimationStyle" parent="@android:style/Animation.Activity">
         <!-- Suppress task-to-task animation happening during the transition from
              OutgoingCallBroadcaster (and SipOptionHandler) to InCallActivity.