From 9218687e4baaf0226ef16b58f78123d979711e5d Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Wed, 4 Mar 2015 18:07:32 -0800
Subject: Implement additional fingerprint flows in Settings.

- new onboarding flow ("locate sensor")
- changed sensor location image
- changed in-app sensor icon
- remove fingerprint animation since it caused people to
want to tap on it.
- remove enrolled fingerprint templates when switching back to "none" or "slide"
- use real in-app icon for fingerprint
- much improved layout
- basic landscape layout working
- added 250ms delay to final enrollment step so it's not so jarring
- delete is now working
- rename wired, but not functional yet

Bug 19592835

Change-Id: Ie3e73a2fc8f834f1b90e2746c4cc841216aa6031
---
 res/drawable-nodpi/fingerprint_anim00.png          | Bin 928 -> 0 bytes
 res/drawable-nodpi/fingerprint_anim01.png          | Bin 3785 -> 0 bytes
 res/drawable-nodpi/fingerprint_anim02.png          | Bin 6934 -> 0 bytes
 res/drawable-nodpi/fingerprint_anim03.png          | Bin 11580 -> 0 bytes
 res/drawable-nodpi/fingerprint_anim04.png          | Bin 14686 -> 0 bytes
 res/drawable-nodpi/fingerprint_anim05.png          | Bin 15360 -> 0 bytes
 res/drawable-nodpi/fingerprint_anim06.png          | Bin 14308 -> 0 bytes
 res/drawable-nodpi/fingerprint_anim07.png          | Bin 13028 -> 0 bytes
 res/drawable-nodpi/fingerprint_anim08.png          | Bin 11631 -> 0 bytes
 res/drawable-nodpi/fingerprint_anim09.png          | Bin 9300 -> 0 bytes
 res/drawable-nodpi/fingerprint_anim10.png          | Bin 6406 -> 0 bytes
 res/drawable-nodpi/fingerprint_anim11.png          | Bin 3915 -> 0 bytes
 res/drawable-nodpi/fingerprint_anim12.png          | Bin 928 -> 0 bytes
 .../fingerprint_in_app_indicator.png               | Bin 35610 -> 0 bytes
 res/drawable-nodpi/fingerprint_sensor_location.png | Bin 15745 -> 0 bytes
 .../fingerprint_in_app_indicator.png               | Bin 0 -> 52728 bytes
 res/drawable-xxhdpi/fingerprint_indicator.png      | Bin 0 -> 11062 bytes
 .../fingerprint_sensor_location.png                | Bin 0 -> 18792 bytes
 res/drawable/fingerprint_animation.xml             |  35 ----------
 res/drawable/fingerprint_progress_ring.xml         |  21 ++++--
 res/drawable/fingerprint_progress_ring_bg.xml      |  22 -------
 res/layout-land/fingerprint_enroll.xml             |  69 ++++++++++----------
 res/layout/fingerprint_enroll.xml                  |  71 +++++++++++----------
 res/layout/fingerprint_rename_dialog.xml           |  36 +++++++++++
 res/values/colors.xml                              |   2 +-
 res/values/dimens.xml                              |   4 ++
 res/values/strings.xml                             |  27 ++++++--
 res/xml/security_settings_fingerprint.xml          |  38 +++++++++++
 28 files changed, 188 insertions(+), 137 deletions(-)
 delete mode 100644 res/drawable-nodpi/fingerprint_anim00.png
 delete mode 100644 res/drawable-nodpi/fingerprint_anim01.png
 delete mode 100644 res/drawable-nodpi/fingerprint_anim02.png
 delete mode 100644 res/drawable-nodpi/fingerprint_anim03.png
 delete mode 100644 res/drawable-nodpi/fingerprint_anim04.png
 delete mode 100644 res/drawable-nodpi/fingerprint_anim05.png
 delete mode 100644 res/drawable-nodpi/fingerprint_anim06.png
 delete mode 100644 res/drawable-nodpi/fingerprint_anim07.png
 delete mode 100644 res/drawable-nodpi/fingerprint_anim08.png
 delete mode 100644 res/drawable-nodpi/fingerprint_anim09.png
 delete mode 100644 res/drawable-nodpi/fingerprint_anim10.png
 delete mode 100644 res/drawable-nodpi/fingerprint_anim11.png
 delete mode 100644 res/drawable-nodpi/fingerprint_anim12.png
 delete mode 100644 res/drawable-nodpi/fingerprint_in_app_indicator.png
 delete mode 100644 res/drawable-nodpi/fingerprint_sensor_location.png
 create mode 100644 res/drawable-xxhdpi/fingerprint_in_app_indicator.png
 create mode 100644 res/drawable-xxhdpi/fingerprint_indicator.png
 create mode 100644 res/drawable-xxhdpi/fingerprint_sensor_location.png
 delete mode 100644 res/drawable/fingerprint_animation.xml
 delete mode 100644 res/drawable/fingerprint_progress_ring_bg.xml
 create mode 100644 res/layout/fingerprint_rename_dialog.xml
 create mode 100644 res/xml/security_settings_fingerprint.xml

(limited to 'res')

diff --git a/res/drawable-nodpi/fingerprint_anim00.png b/res/drawable-nodpi/fingerprint_anim00.png
deleted file mode 100644
index 97d2644..0000000
Binary files a/res/drawable-nodpi/fingerprint_anim00.png and /dev/null differ
diff --git a/res/drawable-nodpi/fingerprint_anim01.png b/res/drawable-nodpi/fingerprint_anim01.png
deleted file mode 100644
index d6c86b8..0000000
Binary files a/res/drawable-nodpi/fingerprint_anim01.png and /dev/null differ
diff --git a/res/drawable-nodpi/fingerprint_anim02.png b/res/drawable-nodpi/fingerprint_anim02.png
deleted file mode 100644
index ddc8ac3..0000000
Binary files a/res/drawable-nodpi/fingerprint_anim02.png and /dev/null differ
diff --git a/res/drawable-nodpi/fingerprint_anim03.png b/res/drawable-nodpi/fingerprint_anim03.png
deleted file mode 100644
index 3435c46..0000000
Binary files a/res/drawable-nodpi/fingerprint_anim03.png and /dev/null differ
diff --git a/res/drawable-nodpi/fingerprint_anim04.png b/res/drawable-nodpi/fingerprint_anim04.png
deleted file mode 100644
index 2f8f949..0000000
Binary files a/res/drawable-nodpi/fingerprint_anim04.png and /dev/null differ
diff --git a/res/drawable-nodpi/fingerprint_anim05.png b/res/drawable-nodpi/fingerprint_anim05.png
deleted file mode 100644
index 47178b7..0000000
Binary files a/res/drawable-nodpi/fingerprint_anim05.png and /dev/null differ
diff --git a/res/drawable-nodpi/fingerprint_anim06.png b/res/drawable-nodpi/fingerprint_anim06.png
deleted file mode 100644
index e0a29d1..0000000
Binary files a/res/drawable-nodpi/fingerprint_anim06.png and /dev/null differ
diff --git a/res/drawable-nodpi/fingerprint_anim07.png b/res/drawable-nodpi/fingerprint_anim07.png
deleted file mode 100644
index d92d75b..0000000
Binary files a/res/drawable-nodpi/fingerprint_anim07.png and /dev/null differ
diff --git a/res/drawable-nodpi/fingerprint_anim08.png b/res/drawable-nodpi/fingerprint_anim08.png
deleted file mode 100644
index 9c77868..0000000
Binary files a/res/drawable-nodpi/fingerprint_anim08.png and /dev/null differ
diff --git a/res/drawable-nodpi/fingerprint_anim09.png b/res/drawable-nodpi/fingerprint_anim09.png
deleted file mode 100644
index 5ebaa0c..0000000
Binary files a/res/drawable-nodpi/fingerprint_anim09.png and /dev/null differ
diff --git a/res/drawable-nodpi/fingerprint_anim10.png b/res/drawable-nodpi/fingerprint_anim10.png
deleted file mode 100644
index b1f9ca9..0000000
Binary files a/res/drawable-nodpi/fingerprint_anim10.png and /dev/null differ
diff --git a/res/drawable-nodpi/fingerprint_anim11.png b/res/drawable-nodpi/fingerprint_anim11.png
deleted file mode 100644
index b8fb5d7..0000000
Binary files a/res/drawable-nodpi/fingerprint_anim11.png and /dev/null differ
diff --git a/res/drawable-nodpi/fingerprint_anim12.png b/res/drawable-nodpi/fingerprint_anim12.png
deleted file mode 100644
index 97d2644..0000000
Binary files a/res/drawable-nodpi/fingerprint_anim12.png and /dev/null differ
diff --git a/res/drawable-nodpi/fingerprint_in_app_indicator.png b/res/drawable-nodpi/fingerprint_in_app_indicator.png
deleted file mode 100644
index 4af83e6..0000000
Binary files a/res/drawable-nodpi/fingerprint_in_app_indicator.png and /dev/null differ
diff --git a/res/drawable-nodpi/fingerprint_sensor_location.png b/res/drawable-nodpi/fingerprint_sensor_location.png
deleted file mode 100644
index 0486dba..0000000
Binary files a/res/drawable-nodpi/fingerprint_sensor_location.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/fingerprint_in_app_indicator.png b/res/drawable-xxhdpi/fingerprint_in_app_indicator.png
new file mode 100644
index 0000000..fc56a9a
Binary files /dev/null and b/res/drawable-xxhdpi/fingerprint_in_app_indicator.png differ
diff --git a/res/drawable-xxhdpi/fingerprint_indicator.png b/res/drawable-xxhdpi/fingerprint_indicator.png
new file mode 100644
index 0000000..fc5ef0f
Binary files /dev/null and b/res/drawable-xxhdpi/fingerprint_indicator.png differ
diff --git a/res/drawable-xxhdpi/fingerprint_sensor_location.png b/res/drawable-xxhdpi/fingerprint_sensor_location.png
new file mode 100644
index 0000000..b95816f
Binary files /dev/null and b/res/drawable-xxhdpi/fingerprint_sensor_location.png differ
diff --git a/res/drawable/fingerprint_animation.xml b/res/drawable/fingerprint_animation.xml
deleted file mode 100644
index a2c1030..0000000
--- a/res/drawable/fingerprint_animation.xml
+++ /dev/null
@@ -1,35 +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.
--->
-
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/fingerprint_animation"
-        android:oneshot="false"
-        android:duration="1000">
-    <item android:drawable="@drawable/fingerprint_anim00" android:duration="77" />
-    <item android:drawable="@drawable/fingerprint_anim01" android:duration="77" />
-    <item android:drawable="@drawable/fingerprint_anim02" android:duration="77" />
-    <item android:drawable="@drawable/fingerprint_anim03" android:duration="77" />
-    <item android:drawable="@drawable/fingerprint_anim04" android:duration="77" />
-    <item android:drawable="@drawable/fingerprint_anim05" android:duration="77" />
-    <item android:drawable="@drawable/fingerprint_anim06" android:duration="77" />
-    <item android:drawable="@drawable/fingerprint_anim07" android:duration="77" />
-    <item android:drawable="@drawable/fingerprint_anim08" android:duration="77" />
-    <item android:drawable="@drawable/fingerprint_anim09" android:duration="77" />
-    <item android:drawable="@drawable/fingerprint_anim10" android:duration="77" />
-    <item android:drawable="@drawable/fingerprint_anim11" android:duration="77" />
-    <item android:drawable="@drawable/fingerprint_anim12" android:duration="77" />
-</animation-list>
diff --git a/res/drawable/fingerprint_progress_ring.xml b/res/drawable/fingerprint_progress_ring.xml
index a2d9cba..04578cd 100644
--- a/res/drawable/fingerprint_progress_ring.xml
+++ b/res/drawable/fingerprint_progress_ring.xml
@@ -15,15 +15,24 @@
 -->
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
+    <item android:id="@android:id/background">
         <shape
-            android:innerRadius="96dip"
+            android:innerRadius="@dimen/fingerprint_ring_radius"
             android:shape="ring"
-            android:thickness="4dip">
+            android:thickness="@dimen/fingerprint_ring_thickness"
+            android:useLevel="false">
+            <solid android:color="@color/fingerprint_progress_ring_bg" />
+        </shape>
+    </item>
+    <item android:id="@android:id/progress">
+        <shape
+            android:innerRadius="@dimen/fingerprint_ring_radius"
+            android:shape="ring"
+            android:thickness="@dimen/fingerprint_ring_thickness">
             <gradient
-                android:startColor="@color/fingerprint_progress_ring_color"
-                android:endColor="@color/fingerprint_progress_ring_color"
-                android:angle="180"
+                android:startColor="@color/fingerprint_progress_ring"
+                android:endColor="@color/fingerprint_progress_ring"
+                android:angle="0"
             />
         </shape>
     </item>
diff --git a/res/drawable/fingerprint_progress_ring_bg.xml b/res/drawable/fingerprint_progress_ring_bg.xml
deleted file mode 100644
index 52d439b..0000000
--- a/res/drawable/fingerprint_progress_ring_bg.xml
+++ /dev/null
@@ -1,22 +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.
--->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:innerRadius="96dip"
-    android:shape="ring"
-    android:thickness="4dip"
-    android:color="@color/fingerprint_progress_ring_bg">
-</shape>
diff --git a/res/layout-land/fingerprint_enroll.xml b/res/layout-land/fingerprint_enroll.xml
index 8954d74..7bd41d1 100644
--- a/res/layout-land/fingerprint_enroll.xml
+++ b/res/layout-land/fingerprint_enroll.xml
@@ -62,62 +62,59 @@
 
     <!-- Right area -->
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
+        android:layout_width="0dip"
+        android:layout_height="match_parent"
         android:layout_weight="1"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/fingerprint_view_selector"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="0dip"
-            android:orientation="vertical"
             android:layout_weight="1"
-            android:layout_gravity="center">
+            android:layout_gravity="center"
+            android:gravity="center">
 
-            <FrameLayout
+            <!-- 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_gravity="center"
-                android:background="@drawable/fingerprint_progress_ring_bg">
+                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" />
 
-                <!-- One of the following views will show for any given mode -->
                 <ProgressBar
                     android:id="@+id/fingerprint_progress_bar"
-                    style="?android:attr/progressBarStyleHorizontal"
                     android:layout_width="200dip"
                     android:layout_height="200dip"
-                    android:max="100"
+                    android:layout_centerInParent="true"
+                    style="?android:attr/progressBarStyleHorizontal"
+                    android:max="10000"
                     android:progress="0"
                     android:indeterminate="false"
                     android:progressDrawable="@drawable/fingerprint_progress_ring" />
 
-                <ImageView
-                    android:id="@+id/fingerprint_sensor_location"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:src="@drawable/fingerprint_sensor_location"
-                    android:visibility="gone"/>
-
-                <ImageView
-                    android:id="@+id/fingerprint_animator"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:src="@drawable/fingerprint_animation"
-                    android:visibility="visible" />
+            </RelativeLayout>
 
-                <ImageView
-                    android:id="@+id/fingerprint_in_app_indicator"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:src="@drawable/fingerprint_in_app_indicator"
-                    android:visibility="visible" />
-            </FrameLayout>
+            <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" />
 
-        </LinearLayout>
+            <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
diff --git a/res/layout/fingerprint_enroll.xml b/res/layout/fingerprint_enroll.xml
index d7bf046..5a0b24b 100644
--- a/res/layout/fingerprint_enroll.xml
+++ b/res/layout/fingerprint_enroll.xml
@@ -25,7 +25,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="0dip"
-        android:layout_weight="0.3"
+        android:layout_weight="0.25"
         android:background="@color/fingerprint_title_area_bg">
 
         <TextView
@@ -44,7 +44,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="0dip"
-        android:layout_weight="0.6"
+        android:layout_weight="0.75"
         android:orientation="vertical">
 
         <TextView
@@ -57,53 +57,55 @@
             android:layout_marginBottom="36dip"
             style="@style/TextAppearance.FingerprintMessage"/>
 
-        <FrameLayout
+        <RelativeLayout
             android:id="@+id/fingerprint_view_selector"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="0dip"
             android:layout_weight="1"
-            android:layout_gravity="center">
+            android:layout_gravity="center"
+            android:gravity="center">
 
-            <FrameLayout
+            <!-- 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_gravity="center"
-                android:background="@drawable/fingerprint_progress_ring_bg">
+                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" />
 
-                <!-- One of the following views will show for any given mode -->
                 <ProgressBar
                     android:id="@+id/fingerprint_progress_bar"
-                    style="?android:attr/progressBarStyleHorizontal"
                     android:layout_width="200dip"
                     android:layout_height="200dip"
-                    android:max="100"
+                    android:layout_centerInParent="true"
+                    style="?android:attr/progressBarStyleHorizontal"
+                    android:max="10000"
                     android:progress="0"
                     android:indeterminate="false"
                     android:progressDrawable="@drawable/fingerprint_progress_ring" />
 
-                <ImageView
-                    android:id="@+id/fingerprint_sensor_location"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:src="@drawable/fingerprint_sensor_location" />
+            </RelativeLayout>
 
-                <ImageView
-                    android:id="@+id/fingerprint_animator"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:src="@drawable/fingerprint_animation" />
+            <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_gravity="center"
-                    android:src="@drawable/fingerprint_in_app_indicator" />
-            </FrameLayout>
+            <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" />
 
-        </FrameLayout>
+        </RelativeLayout>
 
     </LinearLayout>
 
@@ -117,12 +119,15 @@
         <Button
             android:id="@+id/fingerprint_enroll_button_add"
             style="@style/SecurityPreferenceButton"
-            android:text="@string/fingerprint_enroll_button_add" />
+            android:text="@string/fingerprint_enroll_button_add"
+            android:layout_margin="10dip" />
 
         <Button
             android:id="@+id/fingerprint_enroll_button_next"
             style="@style/SecurityPreferenceButton"
-            android:text="@string/fingerprint_enroll_button_next" />
+            android:text="@string/fingerprint_enroll_button_next"
+            android:layout_margin="10dip" />
+
     </LinearLayout>
 
 </LinearLayout>
diff --git a/res/layout/fingerprint_rename_dialog.xml b/res/layout/fingerprint_rename_dialog.xml
new file mode 100644
index 0000000..38b6ff2
--- /dev/null
+++ b/res/layout/fingerprint_rename_dialog.xml
@@ -0,0 +1,36 @@
+<?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="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical|start"
+        android:layout_margin="10dip"
+        android:text="@string/security_settings_fingerprint_enroll_dialog_name_label"/>
+
+    <EditText
+        android:id="@+id/fingerprint_rename_field"
+        android:layout_width="160dip"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 21b5924..83449f9 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -63,7 +63,7 @@
     <color name="fingerprint_title_area_bg">#ff009688</color>
     <color name="fingerprint_title_color">#ffffffff</color>
     <color name="fingerprint_message_color">#de000000</color>
-    <color name="fingerprint_progress_ring_color">#ff009688</color>
+    <color name="fingerprint_progress_ring">#ff009688</color>
     <color name="fingerprint_progress_ring_bg">#20000000</color>
 
     <color name="running_processes_system_ram">#ff384248</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index a494db9..5ed69c4 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -233,4 +233,8 @@
     <!-- RedactionInterstitial -->
     <dimen name="redaction_vertical_margins">8dp</dimen>
 
+    <!-- Fingerprint -->
+    <dimen name="fingerprint_ring_radius">96dip</dimen>
+    <dimen name="fingerprint_ring_thickness">4dip</dimen>
+
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 01fa8da..d99570b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -759,7 +759,15 @@
     <!-- Fingerprint enrollment and settings --><skip />
     <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
     <string name="security_settings_fingerprint_preference_title">Fingerprint</string>
-    <!-- Message shown for menu item that launches fingerprint settings or enrollment -->
+    <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
+    <string name="fingerprint_manage_category_title">Manage fingerprints</string>
+    <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
+	<string name="fingerprint_usage_category_title">Use fingerprint for</string>
+	<!-- Preference to add another fingerprint -->
+	<string name="fingerprint_add_title">Add</string>
+	<!-- switch for allowing fingerprint to be used for keyguard -->
+	<string name="fingerprint_enable_keyguard_toggle_title">screen lock</string>
+    <!-- message shown for menu item that launches fingerprint settings or enrollment -->
     <plurals name="security_settings_fingerprint_preference_summary">
         <item quantity="one"><xliff:g id="count">%1$d</xliff:g> fingerprint enrolled</item>
         <item quantity="other"><xliff:g id="count">%1$d</xliff:g> fingerprints enrolled</item>
@@ -769,8 +777,19 @@
     <!-- Introduction detail message shown in fingerprint enrollment dialog -->
     <string name="security_settings_fingerprint_enroll_onboard_message">
         To use your fingerprint to unlock your screen or confirm purchases, we\'ll need to:
-        \n\u2713 Set up your background screen lock method
-        \n\u2713 Add your fingerprint</string>
+        \n\n\u2713 Set up your background screen lock method
+        \n\n\u2713 Add your fingerprint</string>
+    <!-- Introduction title shown in fingerprint enrollment dialog to locate the sensor [CHAR LIMIT=22] -->
+    <string name="security_settings_fingerprint_enroll_find_sensor_title">Find the sensor</string>
+    <!-- Introduction detail message shown in fingerprint enrollment dialog -->
+    <string name="security_settings_fingerprint_enroll_find_sensor_message">
+        Locate the fingerprint sensor on the back of your phone.</string>
+    <!-- Label text shown in fingerprint dialog for renaming a fingerprint template [CHAR LIMIT=22] -->
+    <string name="security_settings_fingerprint_enroll_dialog_name_label">Name</string>
+    <!-- Button text shown in fingerprint dialog that allows the user to rename a fingerprint template [CHAR LIMIT=22] -->
+    <string name="security_settings_fingerprint_enroll_dialog_ok">OK</string>
+    <!-- Button text shown in fingerprint dialog that allows the user to delete the fingerprint template [CHAR LIMIT=22] -->
+    <string name="security_settings_fingerprint_enroll_dialog_delete">Delete</string>
     <!-- Title shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=22]-->
     <string name="security_settings_fingerprint_enroll_start_title">Let\'s start!</string>
     <!-- Message shown in fingerprint enrollment dialog to begin enrollment -->
@@ -2675,7 +2694,7 @@
 
     <!-- Lock Pattern settings -->
     <!-- Security & location settings screen, header -->
-    <string name="lock_settings_title">Screen security</string>
+    <string name="lock_settings_title">Device security</string>
     <!-- Security & location settings screen, setting option name -->
     <string name="lockpattern_change_lock_pattern_label">Change unlock pattern</string>
     <!-- Security & location settings screen, change unlock pattern screen instruction when the user chooses "Change unlock pattern".  We first ask the user toe nter the current pattern, and this is the message seen -->
diff --git a/res/xml/security_settings_fingerprint.xml b/res/xml/security_settings_fingerprint.xml
new file mode 100644
index 0000000..7cc3a56
--- /dev/null
+++ b/res/xml/security_settings_fingerprint.xml
@@ -0,0 +1,38 @@
+<?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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  android:title="@string/security_settings_fingerprint_preference_title">
+
+    <PreferenceCategory
+        android:key="fingerprint_manage_category"
+        android:title="@string/fingerprint_manage_category_title">
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="fingerprint_usage_category"
+        android:title="@string/fingerprint_usage_category_title">
+
+        <SwitchPreference
+            android:key="fingerprint_enable_keyguard_toggle"
+            android:title="@string/fingerprint_enable_keyguard_toggle_title"
+            android:persistent="false" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
+
-- 
cgit v1.1