summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2015-06-10 15:05:30 -0700
committerJorim Jaggi <jjaggi@google.com>2015-06-11 15:13:56 -0700
commit436e02c3d58d8e28dd29e9364ca56acf3821e663 (patch)
tree38dd0767accaf4be9e26fcbbf7cd2a3bc6c72bbd /res/layout
parent3f94f562c12c566b9f480e712ef617fac67a59f6 (diff)
downloadpackages_apps_Settings-436e02c3d58d8e28dd29e9364ca56acf3821e663.zip
packages_apps_Settings-436e02c3d58d8e28dd29e9364ca56acf3821e663.tar.gz
packages_apps_Settings-436e02c3d58d8e28dd29e9364ca56acf3821e663.tar.bz2
Refine fingerprint enrollment experience
- Flash fingerprint graphic when enrollment progresses - Show hint message when not progressing for a few seconds - Make sure animation is always working Bug: 21617091 Bug: 21644138 Change-Id: Ic54c10a655e6da914f960cee20f0066b46d87325
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/fingerprint_enroll_enrolling_base.xml3
-rw-r--r--res/layout/fingerprint_enroll_enrolling_content.xml10
-rw-r--r--res/layout/fingerprint_enroll_finish_base.xml1
3 files changed, 5 insertions, 9 deletions
diff --git a/res/layout/fingerprint_enroll_enrolling_base.xml b/res/layout/fingerprint_enroll_enrolling_base.xml
index 37e10ba..21221cf 100644
--- a/res/layout/fingerprint_enroll_enrolling_base.xml
+++ b/res/layout/fingerprint_enroll_enrolling_base.xml
@@ -66,7 +66,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
- android:layout_gravity="center_horizontal"/>
+ android:layout_gravity="center_horizontal"
+ android:visibility="invisible"/>
</LinearLayout>
diff --git a/res/layout/fingerprint_enroll_enrolling_content.xml b/res/layout/fingerprint_enroll_enrolling_content.xml
index 9fa503b..b3171a3 100644
--- a/res/layout/fingerprint_enroll_enrolling_content.xml
+++ b/res/layout/fingerprint_enroll_enrolling_content.xml
@@ -23,17 +23,13 @@
android:layout_gravity="center_horizontal">
<ImageView
- android:layout_width="88dp"
- android:layout_height="88dp"
- android:layout_centerInParent="true"
- android:src="@drawable/fingerprint_indicator" />
-
- <ImageView
android:id="@+id/fingerprint_animator"
android:layout_width="88dp"
android:layout_height="88dp"
android:layout_centerInParent="true"
- android:src="@drawable/enrollment_fingerprint_isolated_animation" />
+ android:background="@drawable/fp_illustration_enrollment"
+ android:backgroundTint="@color/fingerprint_indicator_background_resting"
+ android:src="@drawable/enrollment_fingerprint_isolated_animation"/>
<ProgressBar
android:id="@+id/fingerprint_progress_bar"
diff --git a/res/layout/fingerprint_enroll_finish_base.xml b/res/layout/fingerprint_enroll_finish_base.xml
index 981c9f0..1c66103 100644
--- a/res/layout/fingerprint_enroll_finish_base.xml
+++ b/res/layout/fingerprint_enroll_finish_base.xml
@@ -63,7 +63,6 @@
android:id="@+id/add_another_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:text="@string/fingerprint_enroll_button_add" />
<Button