summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQi Wang <wangqi@google.com>2016-03-19 00:26:44 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-03-19 00:26:44 +0000
commit04abe42a636feb6bc0055bd6e26b7017f9d97462 (patch)
treeb7c2499a40a6245df7afd51bf5b4b1bec19c4364
parentf804a91865c7916369e1ab119dfb13d35ca5f033 (diff)
parent50a83fe8c660b9d4ef5876c1ba4503481de2c71e (diff)
downloadandroid_packages_apps_Dialer-04abe42a636feb6bc0055bd6e26b7017f9d97462.tar.gz
android_packages_apps_Dialer-04abe42a636feb6bc0055bd6e26b7017f9d97462.tar.bz2
android_packages_apps_Dialer-04abe42a636feb6bc0055bd6e26b7017f9d97462.zip
Merge "Fix emergency call layout." into nyc-dev
-rw-r--r--InCallUI/res/layout-h500dp/call_card_fragment.xml19
1 files changed, 9 insertions, 10 deletions
diff --git a/InCallUI/res/layout-h500dp/call_card_fragment.xml b/InCallUI/res/layout-h500dp/call_card_fragment.xml
index c3ae877e7..2ef6e52da 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>