From 4fd2e5f39836f0f6d5f3461eb6785a78f82b2350 Mon Sep 17 00:00:00 2001
From: Paul Lawrence <paullawrence@google.com>
Date: Mon, 11 Aug 2014 14:05:33 -0700
Subject: Fix UI to mocks

Bug: 16034329
Change-Id: I6746baeee3f49ad1df2524d690c870f49afedb48
---
 res/layout-sw600dp/crypt_keeper_pattern_entry.xml | 30 +++++++++++------------
 1 file changed, 14 insertions(+), 16 deletions(-)

(limited to 'res/layout-sw600dp/crypt_keeper_pattern_entry.xml')

diff --git a/res/layout-sw600dp/crypt_keeper_pattern_entry.xml b/res/layout-sw600dp/crypt_keeper_pattern_entry.xml
index 4685ebf40..393700870 100644
--- a/res/layout-sw600dp/crypt_keeper_pattern_entry.xml
+++ b/res/layout-sw600dp/crypt_keeper_pattern_entry.xml
@@ -18,26 +18,24 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:layout_marginTop="@dimen/crypt_keeper_pattern_top_margin">
 
     <include layout="@layout/crypt_keeper_status" />
 
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:layout_gravity="center_horizontal">
+    <LinearLayout
+        android:layout_width="@dimen/crypt_keeper_pattern_size"
+        android:layout_height="@dimen/crypt_keeper_pattern_size"
+        android:orientation="horizontal"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="@dimen/crypt_keeper_pattern_separator">
+
+        <include layout="@layout/crypt_keeper_pattern_field" />
+
+    </LinearLayout>
 
-        <!-- Password entry field -->
-        <LinearLayout
-            android:layout_height="@dimen/crypt_keeper_pattern_size"
-            android:layout_width="@dimen/crypt_keeper_pattern_size"
-            android:layout_centerVertical="true"
-            android:orientation="horizontal">
-            <include layout="@layout/crypt_keeper_pattern_field" />
-        </LinearLayout>
+    <include layout="@layout/crypt_keeper_emergency_button" />
 
-    </RelativeLayout>
 </LinearLayout>
-- 
cgit v1.2.3