Update fingerprint enroll UI to spec.

Also adds sliding animations between the steps. Bug: 20495507 Change-Id: I148d8d8b8082361149f02fd2dc4cead0ba3e2526
author: Jorim Jaggi <jjaggi@google.com> 2015-04-22 16:17:23 -0700
committer: Jorim Jaggi <jjaggi@google.com> 2015-04-24 14:26:15 -0700
commit: 5ad75f07b1861b802b75c720830db260b4f93417 (patch)
tree: fe4ef6a32996a6d54e5d83c05d88d5b7c595dade /res/layout-land
parent: 5c012ec4829ca63a71f26fc4bacf121e744494a1 (diff)
download: packages_apps_Settings-5ad75f07b1861b802b75c720830db260b4f93417.tar.gz
packages_apps_Settings-5ad75f07b1861b802b75c720830db260b4f93417.tar.bz2
packages_apps_Settings-5ad75f07b1861b802b75c720830db260b4f93417.zip
4 files changed, 246 insertions, 140 deletions
diff --git a/res/layout-land/fingerprint_enroll.xml b/res/layout-land/fingerprint_enroll.xml
deleted file mode 100644
index 7bd41d1a7..000000000
--- a/res/layout-land/fingerprint_enroll.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_vertical">
-
-    <!-- Left area -->
-    <LinearLayout
-        android:layout_width="0dip"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="0dip"
-            android:layout_weight="0.4"
-            android:background="@color/fingerprint_title_area_bg"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/fingerprint_enroll_title"
-                android:background="@color/fingerprint_title_area_bg"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="20dip"
-                android:layout_marginStart="40dip"
-                android:layout_marginEnd="40dip"
-                style="@style/TextAppearance.FingerprintTitle"
-                android:layout_alignParentBottom="true"/>
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/fingerprint_enroll_message"
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="0.6"
-            android:layout_marginTop="24dip"
-            android:layout_marginStart="40dip"
-            android:layout_marginEnd="40dip"
-            android:layout_marginBottom="36dip"
-            style="@style/TextAppearance.FingerprintMessage"/>
-
-    </LinearLayout>
-
-    <!-- Right area -->
-    <LinearLayout
-        android:layout_width="0dip"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:orientation="vertical">
-
-        <RelativeLayout
-            android:id="@+id/fingerprint_view_selector"
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1"
-            android:layout_gravity="center"
-            android:gravity="center">
-
-            <!-- Only one of the following views will show for any given mode -->
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true">
-
-                <ImageView
-                    android:id="@+id/fingerprint_animator"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:src="@drawable/fingerprint_indicator" />
-
-                <ProgressBar
-                    android:id="@+id/fingerprint_progress_bar"
-                    android:layout_width="200dip"
-                    android:layout_height="200dip"
-                    android:layout_centerInParent="true"
-                    style="?android:attr/progressBarStyleHorizontal"
-                    android:max="10000"
-                    android:progress="0"
-                    android:indeterminate="false"
-                    android:progressDrawable="@drawable/fingerprint_progress_ring" />
-
-            </RelativeLayout>
-
-            <ImageView
-                android:id="@+id/fingerprint_sensor_location"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:src="@drawable/fingerprint_sensor_location" />
-
-            <ImageView
-                android:id="@+id/fingerprint_in_app_indicator"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:src="@drawable/fingerprint_in_app_indicator" />
-        </RelativeLayout>
-
-        <!-- Button area -->
-        <LinearLayout
-            android:id="@+id/fingerprint_enroll_button_area"
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <Button
-                android:id="@+id/fingerprint_enroll_button_add"
-                style="@style/SecurityPreferenceButton"
-                android:text="@string/fingerprint_enroll_button_add" />
-
-            <Button
-                android:id="@+id/fingerprint_enroll_button_next"
-                style="@style/SecurityPreferenceButton"
-                android:text="@string/fingerprint_enroll_button_next" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout-land/fingerprint_enroll_enrolling.xml b/res/layout-land/fingerprint_enroll_enrolling.xml
new file mode 100644
index 000000000..c60888b5a
--- /dev/null
+++ b/res/layout-land/fingerprint_enroll_enrolling.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
+<com.android.setupwizardlib.SetupWizardLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    style="@style/SetupWizardFingerprintStyle">
+
+    <LinearLayout
+        style="@style/SuwContentFrame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        android:clipToPadding="false"
+        android:clipChildren="false"
+        android:paddingBottom="0dp">
+
+        <!-- Both texts are kept as separate text views so it doesn't jump around in portrait.
+             See layouts/fingerprint_enroll_enrolling_base.xml. -->
+        <FrameLayout
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical">
+
+            <TextView
+                style="@style/TextAppearance.FingerprintMessage"
+                android:id="@+id/start_message"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/security_settings_fingerprint_enroll_start_message"/>
+
+            <TextView
+                style="@style/TextAppearance.FingerprintMessage"
+                android:id="@+id/repeat_message"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/security_settings_fingerprint_enroll_repeat_message"
+                android:visibility="invisible"/>
+
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="match_parent">
+
+            <include layout="@layout/fingerprint_enroll_enrolling_content"/>
+
+            <TextView
+                style="@style/TextAppearance.FingerprintErrorText"
+                android:id="@+id/error_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="16dp"
+                android:layout_gravity="center_horizontal|bottom"/>
+
+        </FrameLayout>
+
+    </LinearLayout>
+
+</com.android.setupwizardlib.SetupWizardLayout>
diff --git a/res/layout-land/fingerprint_enroll_find_sensor.xml b/res/layout-land/fingerprint_enroll_find_sensor.xml
new file mode 100644
index 000000000..1eaa815dc
--- /dev/null
+++ b/res/layout-land/fingerprint_enroll_find_sensor.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
+<com.android.setupwizardlib.SetupWizardLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    style="@style/SetupWizardFingerprintStyle">
+
+    <LinearLayout
+        style="@style/SuwContentFrame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        android:clipToPadding="false"
+        android:clipChildren="false"
+        android:paddingBottom="0dp">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:orientation="vertical">
+
+            <TextView
+                style="@style/TextAppearance.FingerprintMessage"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
+
+            <Button
+                style="@style/Button.FingerprintButton"
+                android:id="@+id/next_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginStart="-12dp"
+                android:gravity="start|center_vertical"
+                android:text="@string/fingerprint_enroll_button_next" />
+        </LinearLayout>
+
+        <FrameLayout
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical">
+
+            <ImageView
+                android:id="@+id/fingerprint_sensor_location"
+                android:layout_width="200dp"
+                android:layout_height="200dp"
+                android:layout_gravity="center"
+                android:contentDescription="@string/security_settings_fingerprint_enroll_find_sensor_content_description"
+                android:src="@drawable/fingerprint_sensor_location"
+                android:scaleType="centerInside"/>
+
+        </FrameLayout>
+
+    </LinearLayout>
+
+</com.android.setupwizardlib.SetupWizardLayout>
diff --git a/res/layout-land/fingerprint_enroll_finish.xml b/res/layout-land/fingerprint_enroll_finish.xml
new file mode 100644
index 000000000..aeadd5d0e
--- /dev/null
+++ b/res/layout-land/fingerprint_enroll_finish.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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
+  -->
+
+<com.android.setupwizardlib.SetupWizardLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    style="@style/SetupWizardFingerprintStyle">
+
+    <LinearLayout
+        style="@style/SuwContentFrame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        android:clipToPadding="false"
+        android:clipChildren="false"
+        android:paddingBottom="0dp">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:orientation="vertical">
+
+            <TextView
+                style="@style/TextAppearance.FingerprintMessage"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/security_settings_fingerprint_enroll_finish_message"/>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginStart="-12dp"
+                android:orientation="horizontal">
+
+                <Button
+                    style="@style/Button.FingerprintButton"
+                    android:id="@+id/add_another_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:gravity="start|center_vertical"
+                    android:text="@string/fingerprint_enroll_button_add" />
+
+                <Button
+                    style="@style/Button.FingerprintButton"
+                    android:id="@+id/next_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/security_settings_fingerprint_enroll_done" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <FrameLayout
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical">
+
+            <ImageView
+                android:id="@+id/fingerprint_in_app_indicator"
+                android:layout_width="120dp"
+                android:layout_height="120dp"
+                android:layout_gravity="center_horizontal"
+                android:src="@drawable/fp_app_indicator" />
+
+        </FrameLayout>
+
+    </LinearLayout>
+
+</com.android.setupwizardlib.SetupWizardLayout>
author	Jorim Jaggi <jjaggi@google.com>	2015-04-22 16:17:23 -0700
committer	Jorim Jaggi <jjaggi@google.com>	2015-04-24 14:26:15 -0700
commit	5ad75f07b1861b802b75c720830db260b4f93417 (patch)
tree	fe4ef6a32996a6d54e5d83c05d88d5b7c595dade /res/layout-land
parent	5c012ec4829ca63a71f26fc4bacf121e744494a1 (diff)
download	packages_apps_Settings-5ad75f07b1861b802b75c720830db260b4f93417.tar.gz packages_apps_Settings-5ad75f07b1861b802b75c720830db260b4f93417.tar.bz2 packages_apps_Settings-5ad75f07b1861b802b75c720830db260b4f93417.zip