From 747c03ea608aeba0a068fce21377bafc90ca639c Mon Sep 17 00:00:00 2001
From: Ta-wei Yen <twyen@google.com>
Date: Tue, 24 Nov 2015 12:06:41 -0800
Subject: Fix hangup button disappearring on sprout

+ Changed the FrameLayout outside floating_end_call_action_button_container
  to RelativeLayout.

Not sure why the original one doesn't work on sprout.

Bug:25835494
Change-Id: I784b552629936f354ca41e6268eb2be57ff869e2
---
 InCallUI/res/layout/call_card_fragment.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'InCallUI')

diff --git a/InCallUI/res/layout/call_card_fragment.xml b/InCallUI/res/layout/call_card_fragment.xml
index 2b8e811e5..760e4e261 100644
--- a/InCallUI/res/layout/call_card_fragment.xml
+++ b/InCallUI/res/layout/call_card_fragment.xml
@@ -56,7 +56,7 @@
 
         </LinearLayout>
 
-        <FrameLayout
+        <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="2">
@@ -145,7 +145,8 @@
                 android:layout_width="@dimen/end_call_floating_action_button_diameter"
                 android:layout_height="@dimen/end_call_floating_action_button_diameter"
                 android:background="@drawable/fab_red"
-                android:layout_gravity="bottom|center_horizontal"
+                android:layout_alignParentBottom="true"
+                android:layout_centerHorizontal="true"
                 android:layout_marginBottom="@dimen/end_call_button_margin_bottom">
 
                 <ImageButton android:id="@+id/floating_end_call_action_button"
@@ -158,7 +159,7 @@
 
             </FrameLayout>
 
-        </FrameLayout>
+        </RelativeLayout>
 
     </LinearLayout>
     <!-- Secondary "Call info" block, for the background ("on hold") call. -->
-- 
cgit v1.2.3