From 312927abd77b0884eed9aa2ca1de4d0c04b4165f Mon Sep 17 00:00:00 2001
From: Paul Lawrence <paullawrence@google.com>
Date: Thu, 17 Jul 2014 09:57:13 -0700
Subject: Material fixes for tablets

Remove wireframe Android from pattern screen
Remove tablet specific password entry - we don't have one for PIN, and
the password one looks awful.

Bug: 15328359
Change-Id: I3d73a346166641ab72ecf520f9fbe2ee1379fe8a
---
 res/layout-sw600dp/crypt_keeper_pattern_entry.xml | 21 +++++----------------
 1 file changed, 5 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 e82e14f..4685ebf 100644
--- a/res/layout-sw600dp/crypt_keeper_pattern_entry.xml
+++ b/res/layout-sw600dp/crypt_keeper_pattern_entry.xml
@@ -20,8 +20,7 @@
 <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">
 
     <include layout="@layout/crypt_keeper_status" />
 
@@ -29,24 +28,14 @@
         android:layout_width="wrap_content"
         android:layout_height="0dip"
         android:layout_weight="1"
-        android:layout_gravity="center_horizontal"
-    >
-        <ImageView android:id="@+id/encroid"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:src="@drawable/encroid_resignin"
-            android:contentDescription="@null"
-        />
+        android:layout_gravity="center_horizontal">
 
         <!-- Password entry field -->
         <LinearLayout
-            android:layout_height="354dip"
-            android:layout_width="354dip"
-            android:layout_toEndOf="@+id/encroid"
+            android:layout_height="@dimen/crypt_keeper_pattern_size"
+            android:layout_width="@dimen/crypt_keeper_pattern_size"
             android:layout_centerVertical="true"
-            android:orientation="horizontal"
-        >
+            android:orientation="horizontal">
             <include layout="@layout/crypt_keeper_pattern_field" />
         </LinearLayout>
 
-- 
cgit v1.1