From 09bbf1595013b3d871230c368d26d577f60a0b8a Mon Sep 17 00:00:00 2001
From: Evan Charlton <evanc@google.com>
Date: Fri, 9 May 2014 13:23:34 -0700
Subject: Re-add network indicator/handoff button

Add a handoff button (and network indicator) back into InCallUI. This
has not be vetted by UX or anything, but it will hopefully not cause
merge conflicts.

Change-Id: I6d0a8e7cd865df70b13fc69ec96cdc98e0e3f203
---
 InCallUI/res/layout/call_card.xml | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

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

diff --git a/InCallUI/res/layout/call_card.xml b/InCallUI/res/layout/call_card.xml
index 07ecef074..4b20b8a72 100644
--- a/InCallUI/res/layout/call_card.xml
+++ b/InCallUI/res/layout/call_card.xml
@@ -80,17 +80,33 @@
         </LinearLayout>
 
         <FrameLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|center">
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|center">
 
             <ImageButton android:id="@+id/endButton"
-                android:layout_width="@dimen/floating_action_button_width"
-                android:layout_height="@dimen/floating_action_button_height"
-                android:layout_marginBottom="@dimen/end_call_button_margin_bottom"
-                android:background="@drawable/floating_end_button_compound_background"
-                android:src="@drawable/ic_in_call_phone_hangup"
-                android:contentDescription="@string/onscreenEndCallText" />
+                         android:layout_width="@dimen/floating_action_button_width"
+                         android:layout_height="@dimen/floating_action_button_height"
+                         android:layout_marginBottom="@dimen/end_call_button_margin_bottom"
+                         android:background="@drawable/floating_end_button_compound_background"
+                         android:src="@drawable/ic_in_call_phone_hangup"
+                         android:contentDescription="@string/onscreenEndCallText" />
+
+        </FrameLayout>
+
+        <!-- Insert a CallService indicator (which controls handoff, too) -->
+        <FrameLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|right">
+
+            <ImageButton android:id="@+id/handoffButton"
+                         android:enabled="false"
+                         android:layout_width="@dimen/floating_action_button_width"
+                         android:layout_height="@dimen/floating_action_button_height"
+                         android:layout_marginBottom="@dimen/end_call_button_margin_bottom"
+                         android:background="@drawable/floating_handoff_button_compound_background"
+                         android:src="@drawable/ic_in_call_pstn" />
 
         </FrameLayout>
 
-- 
cgit v1.2.3