From cf2b7a261d9d4db346a73c11eeb3ae73bb11ebb6 Mon Sep 17 00:00:00 2001
From: Daniel Sandler <dsandler@android.com>
Date: Thu, 8 Nov 2012 00:09:37 -0500
Subject: [PATCH] Compress lockscreen's account login fallback to fit.

 - ECA will not be shown in this mode
 - The login button shares a row with the password field

Nice and tidy.

Bug: 7456674
Change-Id: I38d04dcb7ee32d0b289f03f9e8dcbe38ba23a119
---
 core/res/res/layout/keyguard_account_view.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/res/res/layout/keyguard_account_view.xml b/core/res/res/layout/keyguard_account_view.xml
index 17175caa2dc88..8bc1da2973509 100644
--- a/core/res/res/layout/keyguard_account_view.xml
+++ b/core/res/res/layout/keyguard_account_view.xml
@@ -51,6 +51,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/login"
+            android:layout_toLeftOf="@+id/ok"
             android:layout_marginTop="15dip"
             android:layout_marginStart="7dip"
             android:layout_marginEnd="7dip"
@@ -67,12 +68,13 @@
             android:layout_height="wrap_content"
             android:layout_margin="7dip"
             android:layout_alignParentEnd="true"
-            android:layout_alignParentBottom="true"
+            android:layout_below="@id/login"
             android:text="@string/kg_login_submit_button"
             />
 
     </RelativeLayout>
 
+    <!--  no room for ECA on this screen right now
     <include layout="@layout/keyguard_emergency_carrier_area"
         android:id="@+id/keyguard_selector_fade_container"
         android:layout_width="match_parent"
@@ -80,5 +82,6 @@
         android:orientation="vertical"
         android:layout_gravity="bottom|center_horizontal"
         android:gravity="center_horizontal" />
+    -->
 
 </com.android.internal.policy.impl.keyguard.KeyguardAccountView>