Fix layout for decryption password entry.

Use the same layout for landscape and portrait, which vertically centers
the password entry field. Works fine for portrait.

Also removed some vestigial keyboard view in the layout.

Bug: 7298970
Change-Id: I499468dda5e6eb46815fd0bed786d14c892cc830

1 files changed, 7 insertions, 7 deletions

diff --git a/res/layout-sw600dp/crypt_keeper_password_entry.xml b/res/layout-sw600dp/crypt_keeper_password_entry.xml
index 731fb22..f0a7cd0 100644
--- a/res/layout-sw600dp/crypt_keeper_password_entry.xml
+++ b/res/layout-sw600dp/crypt_keeper_password_entry.xml
@@ -16,23 +16,25 @@
 ** limitations under the License.
 */
 -->
+
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
 >
+
     <include layout="@layout/crypt_keeper_status" />
 
     <RelativeLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="0dip"
+        android:layout_weight="1"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="318dip"
     >
         <ImageView android:id="@+id/encroid"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
+            android:layout_centerVertical="true"
             android:src="@drawable/encroid_resignin"
             android:contentDescription="@null"
         />
@@ -41,8 +43,7 @@
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:layout_toEndOf="@+id/encroid"
-            android:layout_marginTop="37dip"
-            android:paddingStart="17dip"
+            android:layout_centerVertical="true"
             android:paddingEnd="17dip"
             android:singleLine="true"
             android:textAppearance="?android:attr/textAppearanceMedium"
@@ -54,12 +55,11 @@
             android:layout_height="wrap_content"
             android:layout_width="320dip"
             android:layout_toEndOf="@+id/passwordLabel"
-            android:layout_marginTop="26dip"
             android:layout_centerVertical="true"
             android:orientation="horizontal"
         >
             <include layout="@layout/crypt_keeper_password_field" />
         </LinearLayout>
-    </RelativeLayout>
 
+    </RelativeLayout>
 </LinearLayout>