summaryrefslogtreecommitdiffstats
path: root/res/layout-land
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout-land')
-rw-r--r--res/layout-land/choose_lock_password.xml45
-rw-r--r--res/layout-land/choose_lock_pattern.xml5
-rw-r--r--res/layout-land/choose_lock_pattern_tutorial.xml92
-rw-r--r--res/layout-land/confirm_lock_password.xml94
-rw-r--r--res/layout-land/confirm_lock_pattern.xml5
5 files changed, 205 insertions, 36 deletions
diff --git a/res/layout-land/choose_lock_password.xml b/res/layout-land/choose_lock_password.xml
index f2a2f46..005dd63 100644
--- a/res/layout-land/choose_lock_password.xml
+++ b/res/layout-land/choose_lock_password.xml
@@ -39,7 +39,7 @@
android:layout_marginBottom="10dip"
android:gravity="left"
android:ellipsize="marquee"
- android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textAppearance="?android:attr/textAppearanceMedium"
/>
<!-- Password entry field -->
@@ -58,15 +58,10 @@
android:textAppearance="?android:attr/textAppearanceLarge"
android:background="@drawable/password_field_default"
android:textColor="#ffffffff"
+ android:imeOptions="actionNext|flagNoEnterAction"
/>
</LinearLayout>
- <!-- Spacer between password entry and keyboard -->
- <View
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1" />
-
<!-- Alphanumeric keyboard -->
<com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
android:layout_alignParentBottom="true"
@@ -74,32 +69,30 @@
android:layout_height="wrap_content"
android:background="#00000000"
android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
+ android:visibility="gone"
/>
<RelativeLayout
- android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:background="@android:drawable/bottom_bar"
- android:visibility="gone">
+ android:layout_height="0dip"
+ android:layout_weight="1">
+ <LinearLayout
+ style="@style/SecurityPreferenceButtonContainer"
+ android:orientation="horizontal"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentBottom="true">
- <Button android:id="@+id/cancel_button"
- android:layout_width="150dip"
- android:layout_height="wrap_content"
- android:layout_margin="5dip"
- android:layout_alignParentLeft="true"
- android:text="@string/lockpassword_cancel_label"
- />
+ <!-- left : cancel -->
+ <Button android:id="@+id/cancel_button"
+ style="@style/SecurityPreferenceButton"
+ 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"
- />
+ <!-- right : continue -->
+ <Button android:id="@+id/next_button"
+ style="@style/SecurityPreferenceButton"
+ android:text="@string/lockpassword_continue_label"/>
+ </LinearLayout>
</RelativeLayout>
</LinearLayout>
diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml
index 9af76d1..588d8da 100644
--- a/res/layout-land/choose_lock_pattern.xml
+++ b/res/layout-land/choose_lock_pattern.xml
@@ -82,10 +82,11 @@
android:background="@*android:drawable/code_lock_left"
android:layout_width="2dip"
android:layout_height="match_parent" />
+
<!-- right side: lock pattern -->
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout-land/choose_lock_pattern_tutorial.xml b/res/layout-land/choose_lock_pattern_tutorial.xml
new file mode 100644
index 0000000..ac693cc
--- /dev/null
+++ b/res/layout-land/choose_lock_pattern_tutorial.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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.
+-->
+
+<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/topLayout"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <!-- Top: pattern and information -->
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"
+ android:orientation="horizontal">
+
+ <!-- left side: lock pattern. Given the square aspect, this will be the smaller of the
+ two dimensions (height) -->
+ <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+
+ <!-- right side: instructions and buttons -->
+ <!-- header message -->
+ <ScrollView
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginLeft="25dip">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:padding="5dip">
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_horizontal"
+ android:text="@string/lock_title"
+ android:paddingBottom="10dip"
+ style="?android:attr/textAppearanceLarge"
+ />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="18sp"
+ android:text="@string/lock_intro_message"
+ />
+
+ </LinearLayout>
+
+ </ScrollView>
+
+ </LinearLayout>
+
+ <!-- Bottom: cancel/next buttons -->
+ <LinearLayout
+ style="@style/SecurityPreferenceButtonContainer"
+ android:orientation="horizontal">
+
+ <!-- left / top button: skip, or re-try -->
+ <Button android:id="@+id/skip_button"
+ style="@style/SecurityPreferenceButton"
+ android:text="@string/lockpattern_tutorial_cancel_label"/>
+
+ <!-- right / bottom button: confirm or ok -->
+ <Button android:id="@+id/next_button"
+ style="@style/SecurityPreferenceButton"
+ android:text="@string/lockpattern_tutorial_continue_label"/>
+
+ </LinearLayout>
+
+</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
+
diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index 3a27b9d..e5580eb 100644
--- a/res/layout-land/confirm_lock_password.xml
+++ b/res/layout-land/confirm_lock_password.xml
@@ -16,12 +16,94 @@
** limitations under the License.
*/
-->
+<!-- This is basically the same layout as choose_lock_password. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical"
+ android:background="@android:color/background_dark"
+ android:gravity="center_horizontal">
-<!-- This is basically the same layout now, but will likely change -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
- <include
- layout="@layout/choose_lock_password"
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+ <!-- "Enter PIN(Password) to unlock" -->
+ <TextView android:id="@+id/headerText"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="horizontal"
+ android:layout_marginRight="6dip"
+ android:layout_marginLeft="6dip"
+ android:layout_marginTop="10dip"
+ android:layout_marginBottom="10dip"
+ android:gravity="left"
+ android:ellipsize="marquee"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ />
+
+ <!-- Password entry field -->
+ <EditText android:id="@+id/password_entry"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:singleLine="true"
+ android:textStyle="bold"
+ android:inputType="textPassword"
+ android:gravity="center"
+ android:layout_gravity="center"
+ android:textSize="24sp"
+ android:layout_marginTop="5dip"
+ android:layout_marginBottom="5dip"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:background="@drawable/password_field_default"
+ android:textColor="#ffffffff"
+ android:imeOptions="actionNext|flagNoEnterAction"
+ />
+ </LinearLayout>
+
+ <!-- Spacer between password entry and keyboard -->
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1" />
+
+ <!-- Alphanumeric keyboard -->
+ <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
+ android:layout_alignParentBottom="true"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="#00000000"
+ android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
+ android:visibility="gone"
/>
-</merge>
+
+ <RelativeLayout
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:background="@android:drawable/bottom_bar"
+ android:visibility="gone">
+
+ <Button android:id="@+id/cancel_button"
+ android:layout_width="150dip"
+ android:layout_height="wrap_content"
+ android:layout_margin="5dip"
+ android:layout_alignParentLeft="true"
+ 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>
+
diff --git a/res/layout-land/confirm_lock_pattern.xml b/res/layout-land/confirm_lock_pattern.xml
index 2da2b9a..8c4e912 100644
--- a/res/layout-land/confirm_lock_pattern.xml
+++ b/res/layout-land/confirm_lock_pattern.xml
@@ -56,10 +56,11 @@
android:background="@*android:drawable/code_lock_left"
android:layout_width="2dip"
android:layout_height="match_parent" />
+
<!-- right side: lock pattern -->
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
generated by cgit v1.1 at 2025-08-25 03:53:55 +0000