Fix 3148496: Update LockScreen layouts on large device
This updates the layouts to conform to the latest UX spec on
large devices and fixes a bug where the IME shown for PIN
selection was the QWERTY keyboard.
Change-Id: Ib9f0b1631f11c8eff6898bfff9447d3dad75cc42
diff --git a/res/layout-xlarge-land/choose_lock_password.xml b/res/layout-xlarge-land/choose_lock_password.xml
index 1276681..5f7cfaf 100644
--- a/res/layout-xlarge-land/choose_lock_password.xml
+++ b/res/layout-xlarge-land/choose_lock_password.xml
@@ -16,15 +16,16 @@
** 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="fill_parent"
- android:layout_height="fill_parent"
- android:orientation="vertical"
- android:gravity="center_horizontal">
+ android:layout_height="fill_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="72dip"
android:orientation="horizontal">
<!-- "Enter PIN(Password) to unlock" -->
@@ -61,12 +62,31 @@
/>
</LinearLayout>
- <!-- Spacer between password entry and keyboard -->
- <View
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1" />
+ <!-- confirm / restart buttons -->
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentBottom="true"
+ android:orientation="horizontal">
+ <!-- left / top button: skip, or re-try -->
+ <Button android:id="@+id/cancel_button"
+ android:layout_width="140dip"
+ android:layout_height="wrap_content"
+ android:ellipsize="marquee"
+ android:singleLine="true"
+ android:text="@string/lockpassword_cancel_label"/>
+
+ <!-- right / bottom button: confirm or ok -->
+ <Button android:id="@+id/next_button"
+ android:layout_width="140dip"
+ android:layout_height="wrap_content"
+ android:ellipsize="marquee"
+ android:singleLine="true"
+ android:text="@string/lockpassword_continue_label"/>
+
+ </LinearLayout>
<!-- Alphanumeric keyboard -->
<com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
android:layout_alignParentBottom="true"
@@ -77,33 +97,4 @@
android:visibility="gone"
/>
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1">
-
- <Button android:id="@+id/cancel_button"
- android:layout_height="wrap_content"
- android:layout_width="140dip"
- android:ellipsize="marquee"
- android:singleLine="true"
- android:layout_alignParentBottom="true"
- android:layout_toLeftOf="@id/next_button"
- android:text="@string/lockpassword_cancel_label"
- />
-
- <Button android:id="@+id/next_button"
- android:layout_width="140dip"
- android:layout_height="wrap_content"
- android:ellipsize="marquee"
- android:singleLine="true"
- android:layout_alignParentRight="true"
- android:layout_alignParentBottom="true"
- android:text="@string/lockpassword_continue_label"
- />
-
- </RelativeLayout>
-
-</LinearLayout>
-
-
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-xlarge-land/choose_lock_pattern.xml b/res/layout-xlarge-land/choose_lock_pattern.xml
index fa2498f..e2cbdab 100644
--- a/res/layout-xlarge-land/choose_lock_pattern.xml
+++ b/res/layout-xlarge-land/choose_lock_pattern.xml
@@ -21,62 +21,69 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <!-- left side: lock pattern -->
- <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
-
- <!-- right side: pattern and messages -->
- <LinearLayout
- android:orientation="vertical"
+ <RelativeLayout
android:layout_width="0dip"
android:layout_height="match_parent"
- android:layout_weight="1.0">
+ android:layout_weight="1">
+ <!-- left side: lock pattern -->
+ <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+ android:layout_width="354dip"
+ android:layout_height="354dip"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginTop="72dip"
+ android:layout_marginLeft="111dip"
+ aspect="square"/>
+
+ <!-- right side: instructions and buttons -->
<!-- header message -->
<TextView android:id="@+id/headerText"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="22sp"
- android:gravity="left"/>
+ android:layout_width="542dip"
+ android:layout_height="78dip"
+ android:layout_marginTop="88dip"
+ android:layout_alignParentTop="true"
+ android:layout_toRightOf="@id/lockPattern"
+ android:layout_marginLeft="100dip"
+ android:textSize="22sp"/>
<!-- footer message -->
<TextView android:id="@+id/footerText"
- android:layout_width="wrap_content"
+ android:layout_width="542dip"
android:layout_height="wrap_content"
+ android:layout_below="@id/headerText"
+ android:layout_marginTop="16dip"
+ android:layout_toRightOf="@id/lockPattern"
+ android:layout_marginLeft="100dip"
android:textSize="22sp"
- android:layout_marginTop="40dip"
android:visibility="gone"/>
<!-- confirm / restart buttons -->
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1">
-
- <!-- right / bottom button: confirm or ok -->
- <Button android:id="@+id/footerRightButton"
- android:layout_height="wrap_content"
- android:layout_width="140dip"
- android:layout_alignParentRight="true"
- android:layout_alignParentBottom="true"
- android:ellipsize="marquee"
- android:singleLine="true"
- android:text="@string/lockpattern_confirm_button_text"/>
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentBottom="true"
+ android:orientation="horizontal">
<!-- left / top button: skip, or re-try -->
<Button android:id="@+id/footerLeftButton"
- android:layout_height="wrap_content"
android:layout_width="140dip"
- android:layout_toLeftOf="@id/footerRightButton"
- android:layout_alignParentBottom="true"
+ android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/lockpattern_restart_button_text"/>
- </RelativeLayout>
+ <!-- right / bottom button: confirm or ok -->
+ <Button android:id="@+id/footerRightButton"
+ android:layout_width="140dip"
+ android:layout_height="wrap_content"
+ android:ellipsize="marquee"
+ android:singleLine="true"
+ android:text="@string/lockpattern_confirm_button_text"/>
- </LinearLayout>
+ </LinearLayout>
+
+ </RelativeLayout>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout-xlarge-land/confirm_lock_password.xml b/res/layout-xlarge-land/confirm_lock_password.xml
index cbfe88c..d03923e 100644
--- a/res/layout-xlarge-land/confirm_lock_password.xml
+++ b/res/layout-xlarge-land/confirm_lock_password.xml
@@ -17,16 +17,16 @@
*/
-->
-<!-- This is the same layout as choose_lock_password. TODO: find out why merge fails -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<!-- This is the same layout as choose_lock_password. TODO: find out why merge tag fails -->
+<RelativeLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:orientation="vertical"
- android:gravity="center_horizontal">
+ android:layout_height="fill_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="72dip"
android:orientation="horizontal">
<!-- "Enter PIN(Password) to unlock" -->
@@ -63,12 +63,31 @@
/>
</LinearLayout>
- <!-- Spacer between password entry and keyboard -->
- <View
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1" />
+ <!-- confirm / restart buttons -->
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentBottom="true"
+ android:orientation="horizontal">
+ <!-- left / top button: skip, or re-try -->
+ <Button android:id="@+id/cancel_button"
+ android:layout_width="140dip"
+ android:layout_height="wrap_content"
+ android:ellipsize="marquee"
+ android:singleLine="true"
+ android:text="@string/lockpassword_cancel_label"/>
+
+ <!-- right / bottom button: confirm or ok -->
+ <Button android:id="@+id/next_button"
+ android:layout_width="140dip"
+ android:layout_height="wrap_content"
+ android:ellipsize="marquee"
+ android:singleLine="true"
+ android:text="@string/lockpassword_continue_label"/>
+
+ </LinearLayout>
<!-- Alphanumeric keyboard -->
<com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
android:layout_alignParentBottom="true"
@@ -79,30 +98,4 @@
android:visibility="gone"
/>
- <RelativeLayout
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:visibility="visible">
-
- <Button android:id="@+id/cancel_button"
- android:layout_width="150dip"
- android:layout_height="wrap_content"
- android:layout_margin="5dip"
- android:layout_toLeftOf="@id/next_button"
- android:text="@string/lockpassword_cancel_label"
- />
-
- <Button android:id="@+id/next_button"
- android:layout_width="150dip"
- android:layout_height="wrap_content"
- android:layout_margin="5dip"
- android:layout_alignParentRight="true"
- android:drawableRight="@drawable/ic_btn_next"
- android:drawablePadding="10dip"
- android:text="@string/lockpassword_continue_label"
- />
-
- </RelativeLayout>
-
-</LinearLayout>
-
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-xlarge-land/confirm_lock_pattern.xml b/res/layout-xlarge-land/confirm_lock_pattern.xml
index 29fc93e..04c3e85 100644
--- a/res/layout-xlarge-land/confirm_lock_pattern.xml
+++ b/res/layout-xlarge-land/confirm_lock_pattern.xml
@@ -21,33 +21,42 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <!-- left side: lock pattern -->
- <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
-
- <!-- right side: instructions and buttons -->
- <LinearLayout
- android:orientation="vertical"
+ <RelativeLayout
android:layout_width="0dip"
android:layout_height="match_parent"
- android:layout_weight="1.0">
+ android:layout_weight="1">
+ <!-- left side: lock pattern -->
+ <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+ android:layout_width="354dip"
+ android:layout_height="354dip"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginTop="72dip"
+ android:layout_marginLeft="111dip"
+ aspect="square"/>
+
+ <!-- right side: instructions and buttons -->
<!-- header message -->
<TextView android:id="@+id/headerText"
- android:layout_width="match_parent"
+ android:layout_width="542dip"
android:layout_height="wrap_content"
- android:gravity="left"
+ android:layout_marginTop="88dip"
+ android:layout_alignParentTop="true"
+ android:layout_toRightOf="@id/lockPattern"
+ android:layout_marginLeft="100dip"
android:textSize="22sp"/>
<!-- footer message -->
<TextView android:id="@+id/footerText"
- android:layout_width="match_parent"
+ android:layout_width="542dip"
android:layout_height="wrap_content"
- android:layout_marginTop="40dip"
- android:gravity="left"
+ android:layout_below="@id/headerText"
+ android:layout_marginTop="16dip"
+ android:layout_toRightOf="@id/lockPattern"
+ android:layout_marginLeft="100dip"
android:textSize="22sp"/>
- </LinearLayout>
+
+ </RelativeLayout>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>