diff options
author | Jorim Jaggi <jjaggi@google.com> | 2015-04-06 17:47:18 -0700 |
---|---|---|
committer | Jorim Jaggi <jjaggi@google.com> | 2015-04-13 14:59:26 -0700 |
commit | 8a09b619aeb233e2aab1919301f162d8acf1f0f0 (patch) | |
tree | aeec574a47f0f71ab9177b2e4ef7f912e87f61b6 /res/layout-sw600dp/confirm_lock_password.xml | |
parent | b5aa73f46f812ba03518a6d1ac218e3af5975236 (diff) | |
download | packages_apps_Settings-8a09b619aeb233e2aab1919301f162d8acf1f0f0.zip packages_apps_Settings-8a09b619aeb233e2aab1919301f162d8acf1f0f0.tar.gz packages_apps_Settings-8a09b619aeb233e2aab1919301f162d8acf1f0f0.tar.bz2 |
Update confirm device credentials to spec, add fingerprint
- New strings in the screen.
- New layout/style.
- Clean up internal API's around it.
- Add fingerprint support if launched from externally
- Separate theme if launched from externally
- If launched from above Keyguard, use SHOW_WHEN_LOCKED flag
Change-Id: Icdf9bf9e0506841f24e8aab5f0f1d1f4b688951f
Diffstat (limited to 'res/layout-sw600dp/confirm_lock_password.xml')
-rw-r--r-- | res/layout-sw600dp/confirm_lock_password.xml | 125 |
1 files changed, 24 insertions, 101 deletions
diff --git a/res/layout-sw600dp/confirm_lock_password.xml b/res/layout-sw600dp/confirm_lock_password.xml index 12b6ab2..1649aaa 100644 --- a/res/layout-sw600dp/confirm_lock_password.xml +++ b/res/layout-sw600dp/confirm_lock_password.xml @@ -1,103 +1,26 @@ <?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 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:gravity="center_horizontal"> - - <!-- header text ('Enter Pin') --> - <TextView android:id="@+id/headerText" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:gravity="center" - android:textAppearance="?android:attr/textAppearanceMedium"/> - - <!-- spacer above text entry field --> - <View - android:id="@+id/spacerBottom" - android:layout_width="fill_parent" - android:layout_height="1dip" - android:layout_marginTop="6dip" - android:background="@android:drawable/divider_horizontal_dark" - /> - - <!-- Password entry field --> - <EditText android:id="@+id/password_entry" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="15dip" - android:layout_marginStart="30dip" - android:layout_marginEnd="30dip" - android:layout_gravity="center" - android:inputType="textPassword" - android:imeOptions="actionNext" - android:gravity="center" - android:textSize="32sp" - style="@style/TextAppearance.PasswordEntry" - /> - - <!-- 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:layout_marginBottom="30dip" - android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans" - android:visibility="gone" - /> - - <View - android:layout_width="match_parent" - android:layout_height="0dip" - /> - - <RelativeLayout - android:layout_height="wrap_content" - android:layout_width="match_parent"> - - <LinearLayout - style="@style/SecurityPreferenceButtonContainer" - android:layout_alignParentEnd="true" - android:orientation="horizontal"> - - <Button android:id="@+id/cancel_button" - style="@style/SecurityPreferenceButton" - android:text="@string/lockpassword_cancel_label"/> - - <Button android:id="@+id/next_button" - style="@style/SecurityPreferenceButton" - android:text="@string/lockpassword_continue_label"/> - - </LinearLayout> - - </RelativeLayout> - -</LinearLayout> - + ~ Copyright (C) 2015 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 + --> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingTop="48dp"> + + <include layout="@layout/confirm_lock_password_base" + android:layout_width="328dp" + android:layout_height="match_parent" + android:layout_gravity="center_horizontal"/> +</FrameLayout> |