commit 00abeba2c08b656db924d967a0733aa76aea40a7
author Paul Lawrence <paullawrence@google.com> Tue Oct 28 20:08:33 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 28 20:08:33 2014 +0000
tree 55430b692a84426e5d093f043f945b76a498cd5f
parent 496b3f647186866703af1081d26a987069a468a8
parent 59717ad3a7425879cbd7b91316d81cb7a9e5cc3c

Merge "Make emergency button right size" into lmp-mr1-dev

res/layout/crypt_keeper_emergency_button.xml

diff --git a/res/layout/crypt_keeper_emergency_button.xml b/res/layout/crypt_keeper_emergency_button.xml
index d0004de..0b6f810 100644
--- a/res/layout/crypt_keeper_emergency_button.xml
+++ b/res/layout/crypt_keeper_emergency_button.xml
@@ -19,15 +19,21 @@
 
 <!-- Emergency call button.
      Text is set by CryptKeeper.updateEmergencyCallButtonState() -->
-<Button
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/emergencyCallButton"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="0dp"
-    android:layout_gravity="center_horizontal"
-    android:textSize="14sp"
-    android:fontFamily="sans-serif"
-    android:textColor="#FFFFFF"
     android:layout_weight="1"
-    android:gravity="bottom"
-    style="?android:attr/borderlessButtonStyle" />
+    android:orientation="vertical"
+    android:gravity="bottom">
+    <Button
+        android:id="@+id/emergencyCallButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:textSize="14sp"
+        android:fontFamily="sans-serif"
+        android:textColor="#FFFFFF"
+        style="?android:attr/borderlessButtonStyle" />
+
+</LinearLayout>