commit 9613a8675f90b12f6c3906cfaf90d46b9b0c893c
author Qi Wang <wangqi@google.com> Sat Mar 19 00:38:55 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Mar 19 00:38:55 2016 +0000
tree 647e690aa3af267e6c289ab25901d884601c65ae
parent d4def2b9992552967fb8931923e127ce6eced0ea
parent c7a3888a1397b7ab1dfbbcf86aba31765ea6017c

Merge "Fix emergency call layout." into nyc-dev am: 04abe42
am: c7a3888

* commit 'c7a3888a1397b7ab1dfbbcf86aba31765ea6017c':
  Fix emergency call layout.

InCallUI/res/layout-h500dp/call_card_fragment.xml

diff --git a/InCallUI/res/layout-h500dp/call_card_fragment.xml b/InCallUI/res/layout-h500dp/call_card_fragment.xml
index c3ae877..2ef6e52 100644
--- a/InCallUI/res/layout-h500dp/call_card_fragment.xml
+++ b/InCallUI/res/layout-h500dp/call_card_fragment.xml
@@ -44,22 +44,13 @@
                 android:layout_weight="1"
                 android:minHeight="@dimen/call_banner_height"
                 android:animateLayoutChanges="true"
-                android:gravity="center"
-                android:layout_centerHorizontal="true" />
+                android:gravity="center" />
 
             <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>
 
         <RelativeLayout
@@ -165,6 +156,14 @@
 
             </FrameLayout>
 
+            <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" />
+
         </RelativeLayout>
 
     </LinearLayout>