Fix up in-call overflow button.

Give it a meaningful drawable and a nice ripple.

Change-Id: I61eb762059fb41b7b9c387b52e9b91bc5a1a5db3

7 files changed, 73 insertions, 41 deletions

diff --git a/res/drawable-hdpi/overflow_thumbnail.png b/res/drawable-hdpi/overflow_thumbnail.png
deleted file mode 100644
index 57db353f..00000000
--- a/res/drawable-hdpi/overflow_thumbnail.png
+++ /dev/null
diff --git a/res/drawable-mdpi/overflow_thumbnail.png b/res/drawable-mdpi/overflow_thumbnail.png
deleted file mode 100644
index c6993742..00000000
--- a/res/drawable-mdpi/overflow_thumbnail.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/overflow_thumbnail.png b/res/drawable-xhdpi/overflow_thumbnail.png
deleted file mode 100644
index e538b989..00000000
--- a/res/drawable-xhdpi/overflow_thumbnail.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/overflow_thumbnail.png b/res/drawable-xxhdpi/overflow_thumbnail.png
deleted file mode 100644
index 7f3f7338..00000000
--- a/res/drawable-xxhdpi/overflow_thumbnail.png
+++ /dev/null
diff --git a/res/drawable/btn_overflow_horizontal.xml b/res/drawable/btn_overflow_horizontal.xml
new file mode 100644
index 00000000..fdda87a6
--- /dev/null
+++ b/res/drawable/btn_overflow_horizontal.xml
@@ -0,0 +1,40 @@
+<!--
+Copyright (C) 2015 The CyanogenMod 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.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/btn_background" />
+
+    <item>
+        <inset
+            android:insetTop="12dp"
+            android:insetBottom="12dp"
+            android:insetLeft="12dp"
+            android:insetRight="12dp">
+
+            <vector
+                android:width="24dp"
+                android:height="24dp"
+                android:viewportWidth="24.0"
+                android:viewportHeight="24.0">
+
+                <path
+                    android:pathData="M 8,12 c 0,-1.1 -0.9,-2 -2,-2 -1.1,0 -2,0.9 -2,2 0,1.1 0.9,2 2,2 1.1,0 2,-0.9 2,-2 Z m 2,0 c 0,1.1 0.9,2 2,2 1.1,0 2,-0.9 2,-2 0,-1.1 -0.9,-2 -2,-2 -1.1,0 -2,0.9 -2,2 z m 6,0 c 0,1.1 0.9,2 2,2 1.1,0 2,-0.9 2,-2 0,-1.1 -0.9,-2 -2,-2 -1.1,0 -2,0.9 -2,2 z"
+                    android:fillColor="@color/incall_accent_color" />
+
+            </vector>
+        </inset>
+    </item>
+</layer-list>
diff --git a/res/layout-land/call_card_content.xml b/res/layout-land/call_card_content.xml
index 7c740798..eb769a77 100644
--- a/res/layout-land/call_card_content.xml
+++ b/res/layout-land/call_card_content.xml
@@ -36,17 +36,11 @@
         <ImageButton
             android:id="@+id/moreMenuButton"
             style="@style/InCallButton"
-            android:paddingTop="16dp"
-            android:paddingRight="16dp"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:background="@drawable/overflow_thumbnail"
-            android:layout_gravity="right"
-            android:elevation="@dimen/primary_call_overflow_elevation"
-            android:rotation="90"
+            android:background="@drawable/btn_overflow_horizontal"
+            android:layout_gravity="end"
             android:contentDescription="@string/onscreenMoreMenuText"/>
 
-        <include layout="@layout/primary_call_info" 
+        <include layout="@layout/primary_call_info"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
diff --git a/res/layout/call_card_content.xml b/res/layout/call_card_content.xml
index 72c79dcc..e52fe897 100644
--- a/res/layout/call_card_content.xml
+++ b/res/layout/call_card_content.xml
@@ -29,52 +29,50 @@
          will expand to fill the full height of the CallCard. -->
 
     <!-- Primary "call card" block, for the foreground call. -->
-    <LinearLayout
+    <FrameLayout
         android:id="@+id/primary_call_info_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
         android:elevation="@dimen/primary_call_elevation"
-        android:layout_centerHorizontal="true"
         android:background="@color/incall_call_banner_background_color"
-        android:paddingTop="@dimen/call_banner_primary_call_container_top_padding"
         android:clipChildren="false"
         android:clipToPadding="false">
 
-        <include layout="@layout/primary_call_info" />
-
-        <fragment android:name="com.android.incallui.CallButtonFragment"
-            android:id="@+id/callButtonFragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-        <TextView android:id="@+id/connectionServiceMessage"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:visibility="gone"
-            android:padding="@dimen/call_banner_side_padding"
-            android:background="@android:color/white" />
-
-    </LinearLayout>
-
-    <!--  More menu overflow button for call recording, blacklisting
-          only visible during the call. It sits above the primary call info
-          container in the top-right hand corner. -->
-    <ImageButton
+            android:paddingTop="@dimen/call_banner_primary_call_container_top_padding"
+            android:orientation="vertical">
+
+            <include layout="@layout/primary_call_info" />
+
+            <fragment android:name="com.android.incallui.CallButtonFragment"
+                android:id="@+id/callButtonFragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <TextView android:id="@+id/connectionServiceMessage"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:visibility="gone"
+                android:padding="@dimen/call_banner_side_padding"
+                android:background="@android:color/white" />
+
+        </LinearLayout>
+
+        <!--  More menu overflow button for call recording, blacklisting
+              only visible during the call. It sits above the primary call info
+              container in the top-right hand corner. -->
+        <ImageButton
             android:id="@+id/moreMenuButton"
             style="@style/InCallButton"
-            android:paddingTop="16dp"
-            android:paddingRight="16dp"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:background="@drawable/overflow_thumbnail"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentTop="true"
-            android:elevation="@dimen/primary_call_overflow_elevation"
-            android:rotation="90"
+            android:layout_gravity="top|end"
+            android:background="@drawable/btn_overflow_horizontal"
             android:contentDescription="@string/onscreenMoreMenuText"/>
 
+    </FrameLayout>
+
     <!-- Contact photo for primary call info -->
     <ImageView android:id="@+id/photo"
         android:layout_below="@id/primary_call_info_container"