More CryptKeeper UI work.

* Implemented failure case.
* More pixel perfect
* Remove the animation
* Display the encroid on the blank screen
* Remove the back button.
* Fix portrait mode screens

Bug: 3384231
Bug: 3394103
Bug: 3388721
Bug: 3381450
Bug: 3406278
Bug: 3351832
Change-Id: Ib763c8b577198deb45255acc767bc6d5409efc0c

1 files changed, 36 insertions, 26 deletions

diff --git a/res/layout-xlarge-land/crypt_keeper_password_entry.xml b/res/layout-xlarge-land/crypt_keeper_password_entry.xml
index ffbdf89..f6cbecf 100644
--- a/res/layout-xlarge-land/crypt_keeper_password_entry.xml
+++ b/res/layout-xlarge-land/crypt_keeper_password_entry.xml
@@ -16,57 +16,67 @@
 ** limitations under the License.
 */
 -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
 >
-
     <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="206dip"
     >
-        <!-- left side: status -->
-        <include layout="@layout/crypt_keeper_status"
+        <ImageView android:id="@+id/encroid"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="102dip"
-            android:layout_marginTop="20dip"
-            android:gravity="left"
-            android:paddingTop="50dip"
-            android:layout_centerVertical="true"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true"
+            android:src="@drawable/encroid_resignin"
+        />
+
+        <TextView android:id="@+id/passwordLabel"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_toRightOf="@+id/encroid"
+            android:layout_marginTop="37dip"
+            android:paddingRight="17dip"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:text="@string/crypt_keeper_enter_password"
         />
 
         <!-- Password entry field -->
         <EditText android:id="@+id/passwordEntry"
             android:layout_height="wrap_content"
-            android:layout_width="450dip"
-            android:layout_marginRight="155dip"
-            android:layout_alignParentRight="true"
+            android:layout_width="320dip"
+            android:layout_toRightOf="@+id/passwordLabel"
+            android:layout_marginTop="26dip"
             android:singleLine="true"
-            android:textStyle="normal"
             android:inputType="textPassword"
-            android:gravity="center"
-            android:layout_gravity="center"
-            android:textSize="24sp"
-            android:layout_marginTop="120dip"
-            android:layout_marginBottom="5dip"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="#ffffffff"
             android:editable="false"
         />
 
+        <TextView android:id="@+id/status"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_toRightOf="@+id/passwordLabel"
+            android:layout_below="@+id/passwordEntry"
+            android:paddingTop="8dip"
+            android:singleLine="true"
+            android:textSize="17sp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:drawableLeft="@*android:drawable/ic_lock_idle_lock"
+            android:visibility="gone"
+        />
     </RelativeLayout>
 
     <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
         android:background="#00000000"
         android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
         android:visibility="visible"
     />
 
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file