summaryrefslogtreecommitdiffstats
path: root/res/layout-sw600dp
diff options
context:
space:
mode:
authorPaul Lawrence <paullawrence@google.com>2014-08-11 14:05:33 -0700
committerPaul Lawrence <paullawrence@google.com>2014-08-11 15:00:00 -0700
commit4fd2e5f39836f0f6d5f3461eb6785a78f82b2350 (patch)
tree8d7bafc1a4a4529dd20dcc710f3afe2148cb0d53 /res/layout-sw600dp
parentd58f0bd64f1554a4c15b812bcd90fc52f00860b6 (diff)
downloadpackages_apps_Settings-4fd2e5f39836f0f6d5f3461eb6785a78f82b2350.zip
packages_apps_Settings-4fd2e5f39836f0f6d5f3461eb6785a78f82b2350.tar.gz
packages_apps_Settings-4fd2e5f39836f0f6d5f3461eb6785a78f82b2350.tar.bz2
Fix UI to mocks
Bug: 16034329 Change-Id: I6746baeee3f49ad1df2524d690c870f49afedb48
Diffstat (limited to 'res/layout-sw600dp')
-rw-r--r--res/layout-sw600dp/crypt_keeper_pattern_entry.xml30
1 files changed, 14 insertions, 16 deletions
diff --git a/res/layout-sw600dp/crypt_keeper_pattern_entry.xml b/res/layout-sw600dp/crypt_keeper_pattern_entry.xml
index 4685ebf..3937008 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>