diff options
author | Jim Miller <jaggies@google.com> | 2011-03-30 21:16:48 -0700 |
---|---|---|
committer | Jim Miller <jaggies@google.com> | 2011-03-30 21:16:48 -0700 |
commit | 30cf12cc17506aa463ea9305a31e938c19d1b12f (patch) | |
tree | e1b7f44e9a42bea30686437341cd1602eac732ff /res/layout-land | |
parent | c4d9d80906f7713d7c41b4c5bb770af634656869 (diff) | |
download | packages_apps_Settings-30cf12cc17506aa463ea9305a31e938c19d1b12f.zip packages_apps_Settings-30cf12cc17506aa463ea9305a31e938c19d1b12f.tar.gz packages_apps_Settings-30cf12cc17506aa463ea9305a31e938c19d1b12f.tar.bz2 |
Fix LockScreen Settings on phones.
Change-Id: Ibbb0bcb4f34ba442d9ec678277718d3141f9d807
Diffstat (limited to 'res/layout-land')
-rw-r--r-- | res/layout-land/choose_lock_password.xml | 3 | ||||
-rw-r--r-- | res/layout-land/choose_lock_pattern_tutorial.xml | 93 | ||||
-rw-r--r-- | res/layout-land/confirm_lock_password.xml | 93 |
3 files changed, 182 insertions, 7 deletions
diff --git a/res/layout-land/choose_lock_password.xml b/res/layout-land/choose_lock_password.xml index f2a2f46..10a01c7 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 --> @@ -74,6 +74,7 @@ android:layout_height="wrap_content" android:background="#00000000" android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans" + android:visibility="gone" /> <RelativeLayout 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..606d2e1 --- /dev/null +++ b/res/layout-land/choose_lock_pattern_tutorial.xml @@ -0,0 +1,93 @@ +<?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="horizontal" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <RelativeLayout + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1"> + + <!-- left side: lock pattern --> + <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern" + android:layout_width="300dip" + android:layout_height="300dip" + android:layout_gravity="center_horizontal" + aspect="square"/> + + <!-- right side: instructions and buttons --> + <!-- header message --> + <ScrollView + android:layout_width="300dip" + android:layout_height="180dip" + android:layout_alignParentTop="true" + android:layout_toRightOf="@id/lockPattern" + 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 + style="@style/SecurityPreferenceButtonContainer" + android:layout_alignParentRight="true" + android:layout_alignParentBottom="true" + 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> + + </RelativeLayout> + +</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..4138be1 100644 --- a/res/layout-land/confirm_lock_password.xml +++ b/res/layout-land/confirm_lock_password.xml @@ -16,12 +16,93 @@ ** 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" + /> + </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> + |