Merge "Fix layout for decryption password entry." into jb-mr1-dev
diff --git a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml b/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
deleted file mode 100644
index 81222cc..0000000
--- a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2011, 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.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<!-- Layout containing two panes and a keyboard entry. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
->
-
- <include layout="@layout/crypt_keeper_status" />
-
- <!-- The right pane contains the encdroid image, a string, and an edit field. -->
- <RelativeLayout
- 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"
- />
-
- <TextView android:id="@+id/passwordLabel"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_toEndOf="@+id/encroid"
- android:layout_centerVertical="true"
- android:paddingEnd="17dip"
- android:singleLine="true"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:text="@string/crypt_keeper_enter_password"
- />
-
- <!-- Password entry field -->
- <LinearLayout
- android:layout_height="wrap_content"
- android:layout_width="320dip"
- android:layout_toEndOf="@+id/passwordLabel"
- android:layout_centerVertical="true"
- android:orientation="horizontal"
- >
- <include layout="@layout/crypt_keeper_password_field" />
- </LinearLayout>
-
- </RelativeLayout>
-<!-- And this is the keyboard. -->
- <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="#00000000"
- android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
- android:visibility="visible"
- />
-
-</LinearLayout>
diff --git a/res/layout-sw600dp/crypt_keeper_password_entry.xml b/res/layout-sw600dp/crypt_keeper_password_entry.xml
index 731fb22..f0a7cd0 100644
--- a/res/layout-sw600dp/crypt_keeper_password_entry.xml
+++ b/res/layout-sw600dp/crypt_keeper_password_entry.xml
@@ -16,23 +16,25 @@
** limitations under the License.
*/
-->
+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
+
<include layout="@layout/crypt_keeper_status" />
<RelativeLayout
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="0dip"
+ android:layout_weight="1"
android:layout_gravity="center_horizontal"
- android:layout_marginTop="318dip"
>
<ImageView android:id="@+id/encroid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
+ android:layout_centerVertical="true"
android:src="@drawable/encroid_resignin"
android:contentDescription="@null"
/>
@@ -41,8 +43,7 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_toEndOf="@+id/encroid"
- android:layout_marginTop="37dip"
- android:paddingStart="17dip"
+ android:layout_centerVertical="true"
android:paddingEnd="17dip"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"
@@ -54,12 +55,11 @@
android:layout_height="wrap_content"
android:layout_width="320dip"
android:layout_toEndOf="@+id/passwordLabel"
- android:layout_marginTop="26dip"
android:layout_centerVertical="true"
android:orientation="horizontal"
>
<include layout="@layout/crypt_keeper_password_field" />
</LinearLayout>
- </RelativeLayout>
+ </RelativeLayout>
</LinearLayout>