diff options
author | Jim Miller <jaggies@google.com> | 2010-02-09 19:08:02 -0800 |
---|---|---|
committer | Jim Miller <jaggies@google.com> | 2010-02-10 14:42:35 -0800 |
commit | 2f9dbcb49174d85218dd18e3b2097d3b9fc789c7 (patch) | |
tree | f38e287a4b829dd448370b9d1c7fc156c3423463 /res/layout-land | |
parent | 42241e75d2775b6b44b82b939e66fbb50d4b189b (diff) | |
download | packages_apps_settings-2f9dbcb49174d85218dd18e3b2097d3b9fc789c7.zip packages_apps_settings-2f9dbcb49174d85218dd18e3b2097d3b9fc789c7.tar.gz packages_apps_settings-2f9dbcb49174d85218dd18e3b2097d3b9fc789c7.tar.bz2 |
Fix 2373088: Update SecuritySettings with new layout and minor logic tweaks.
Diffstat (limited to 'res/layout-land')
-rw-r--r-- | res/layout-land/choose_lock_password.xml | 102 | ||||
-rw-r--r-- | res/layout-land/choose_lock_pin.xml | 84 | ||||
-rw-r--r-- | res/layout-land/confirm_lock_password.xml | 27 | ||||
-rw-r--r-- | res/layout-land/confirm_lock_pin.xml | 83 |
4 files changed, 129 insertions, 167 deletions
diff --git a/res/layout-land/choose_lock_password.xml b/res/layout-land/choose_lock_password.xml new file mode 100644 index 0000000..eba936a --- /dev/null +++ b/res/layout-land/choose_lock_password.xml @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +** +** Copyright 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. +*/ +--> +<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"> + + <LinearLayout + android:layout_width="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/textAppearanceLarge" + /> + + <!-- 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: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" + /> + + <RelativeLayout + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:background="@android:drawable/bottom_bar"> + + <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/password_cancel_button_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/password_ok_button_label" + /> + + </RelativeLayout> + +</LinearLayout> diff --git a/res/layout-land/choose_lock_pin.xml b/res/layout-land/choose_lock_pin.xml deleted file mode 100644 index cdc75d3..0000000 --- a/res/layout-land/choose_lock_pin.xml +++ /dev/null @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -** -** Copyright 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. -*/ ---> - -<!-- TODO: think about moving to frameworks/base/res --> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="horizontal" - android:background="@android:color/background_dark"> - - <LinearLayout android:id="@+id/topDisplayGroup" - android:layout_width="0dip" - android:layout_weight="1" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <!-- password entry --> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_marginRight="6dip" - android:layout_marginLeft="6dip" - android:gravity="center_vertical" - android:background="@android:drawable/edit_text"> - - <!-- displays dots as user enters pin --> - <TextView android:id="@+id/pinDisplay" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:maxLines="1" - android:textAppearance="?android:attr/textAppearanceLargeInverse" - android:textStyle="bold" - android:inputType="textPassword" - /> - - <ImageButton android:id="@+id/backspace" - android:src="@android:drawable/ic_input_delete" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginRight="-3dip" - android:layout_marginBottom="-3dip" - /> - </LinearLayout> - - <!-- header text ('Enter Pin') --> - <TextView android:id="@+id/headerText" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:gravity="center" - android:lines="2" - android:textAppearance="?android:attr/textAppearanceLarge"/> - - </LinearLayout> - - <include - android:id="@+id/keyPad" - layout="@layout/twelve_key_entry" - android:layout_width="0dip" - android:layout_weight="1" - android:layout_height="wrap_content" - android:layout_below="@id/topDisplayGroup" - android:layout_marginTop="10dip" - /> - -</LinearLayout> diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml new file mode 100644 index 0000000..3a27b9d --- /dev/null +++ b/res/layout-land/confirm_lock_password.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +** +** Copyright 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. +*/ +--> + +<!-- 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" + android:layout_width="match_parent" + android:layout_height="match_parent" + /> +</merge> diff --git a/res/layout-land/confirm_lock_pin.xml b/res/layout-land/confirm_lock_pin.xml deleted file mode 100644 index beff4a1..0000000 --- a/res/layout-land/confirm_lock_pin.xml +++ /dev/null @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -** -** Copyright 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. -*/ ---> - -<!-- TODO: think about moving to frameworks/base/res --> - -<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"> - - <LinearLayout android:id="@+id/topDisplayGroup" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <!-- header text ('Enter Pin') --> - <TextView android:id="@+id/headerText" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:gravity="center" - android:lines="2" - android:textAppearance="?android:attr/textAppearanceLarge"/> - - <!-- password entry --> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_marginRight="6dip" - android:layout_marginLeft="6dip" - android:gravity="center_vertical" - android:background="@android:drawable/edit_text"> - - <!-- displays dots as user enters pin --> - <TextView android:id="@+id/pinDisplay" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:maxLines="1" - android:textAppearance="?android:attr/textAppearanceLargeInverse" - android:textStyle="bold" - android:inputType="textPassword" - /> - - <ImageButton android:id="@+id/backspace" - android:src="@android:drawable/ic_input_delete" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginRight="-3dip" - android:layout_marginBottom="-3dip" - /> - </LinearLayout> - - </LinearLayout> - - <include - android:id="@+id/keyPad" - layout="@layout/twelve_key_entry" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_below="@id/topDisplayGroup" - android:layout_marginTop="10dip" - /> - -</LinearLayout> |