am 08516de0: (-s ours) am ad7342ec: (-s ours) Import translations. DO NOT MERGE

[android-x86/packages-apps-Settings.git] / res / layout / crypt_keeper_password_entry.xml

diff --git a/res/layout/crypt_keeper_password_entry.xml b/res/layout/crypt_keeper_password_entry.xml
index b26f542..a7fecba 100644 (file)
--- a/res/layout/crypt_keeper_password_entry.xml
+++ b/res/layout/crypt_keeper_password_entry.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 **
-** Copyright 2011, The Android Open Source Project
+** Copyright 2014, The Android Open Source Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License")
 ** you may not use this file except in compliance with the License.
@@ -21,29 +21,22 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
->
+    android:layout_marginTop="@dimen/crypt_keeper_password_top_margin">
+
     <include layout="@layout/crypt_keeper_status" />
 
     <LinearLayout
+        android:layout_width="@dimen/crypt_keeper_password_width"
         android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_marginStart="8dip"
-        android:layout_marginEnd="8dip"
         android:orientation="horizontal"
-    >
+        android:layout_marginTop="16dip"
+        android:layout_gravity="center_horizontal"
+        android:background="@color/crypt_keeper_password_background">
+
         <include layout="@layout/crypt_keeper_password_field" />
+
     </LinearLayout>
 
-    <!-- Emergency call button.
-         Text and icon are set by CryptKeeper.updateEmergencyCallButtonState() -->
-    <Button android:id="@+id/emergencyCallButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="16dip"
-        style="@*android:style/Widget.Button.Transparent"
-        android:textSize="14sp"
-        android:drawablePadding="6dip"
-    />
+    <include layout="@layout/crypt_keeper_emergency_button" />
 
 </LinearLayout>