Visualize password requirements and their fulfillment

am: 0bbcdccdbf

Change-Id: Iad89b5aa1a94c12edeebf42be6c8c380f27bd4ff
This commit is contained in:
Tony Mak
2016-07-12 13:52:31 +00:00
committed by android-build-merger
8 changed files with 542 additions and 186 deletions

View File

@@ -14,7 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<com.android.setupwizardlib.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
@@ -31,9 +30,11 @@
android:orientation="vertical">
<!-- header text ('Enter Pin') -->
<TextView android:id="@+id/headerText"
<TextView
android:id="@+id/headerText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:accessibilityLiveRegion="polite"
android:gravity="center"
android:lines="2"
android:textAppearance="?android:attr/textAppearanceMedium"/>
@@ -50,32 +51,43 @@
style="@style/TextAppearance.PasswordEntry"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false"
android:gravity="end"
android:orientation="horizontal">
android:id="@+id/bottom_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<!-- left : cancel -->
<Button android:id="@+id/cancel_button"
style="@style/SetupWizardButton.Negative"
android:layout_width="wrap_content"
<android.support.v7.widget.RecyclerView
android:id="@+id/password_requirements_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/lockpassword_cancel_label" />
android:clipChildren="false"
android:clipToPadding="false"
android:gravity="end"
android:orientation="horizontal">
<Space
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<!-- left : cancel -->
<Button android:id="@+id/cancel_button"
style="@style/SetupWizardButton.Negative"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lockpassword_cancel_label" />
<!-- right : continue -->
<Button android:id="@+id/next_button"
style="@style/SetupWizardButton.Positive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lockpassword_continue_label" />
<Space
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<!-- right : continue -->
<Button android:id="@+id/next_button"
style="@style/SetupWizardButton.Positive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lockpassword_continue_label" />
</LinearLayout>
</LinearLayout>
<!-- Spacer between password entry and keyboard -->

View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2016 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.
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/description_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="4dp"
android:textSize="14sp"/>