From 436e02c3d58d8e28dd29e9364ca56acf3821e663 Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Wed, 10 Jun 2015 15:05:30 -0700 Subject: [PATCH] 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 --- res/drawable-nodpi/fingerprint_indicator.png | Bin 11062 -> 0 bytes res/drawable/fp_illustration_enrollment.xml | 36 +++++++ res/layout-land/fingerprint_enroll_enrolling.xml | 3 +- res/layout/fingerprint_enroll_enrolling_base.xml | 3 +- .../fingerprint_enroll_enrolling_content.xml | 10 +- res/layout/fingerprint_enroll_finish_base.xml | 1 - res/values/colors.xml | 2 + res/values/dimens.xml | 2 + res/values/strings.xml | 2 + .../fingerprint/FingerprintEnrollEnrolling.java | 106 ++++++++++++++++++++- 10 files changed, 153 insertions(+), 12 deletions(-) delete mode 100644 res/drawable-nodpi/fingerprint_indicator.png create mode 100644 res/drawable/fp_illustration_enrollment.xml diff --git a/res/drawable-nodpi/fingerprint_indicator.png b/res/drawable-nodpi/fingerprint_indicator.png deleted file mode 100644 index fc5ef0ffcb06562181742327d09a9b8bfa2f38e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11062 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 diff --git a/res/drawable/fp_illustration_enrollment.xml b/res/drawable/fp_illustration_enrollment.xml new file mode 100644 index 0000000000..f9b7ed471e --- /dev/null +++ b/res/drawable/fp_illustration_enrollment.xml @@ -0,0 +1,36 @@ + + + + + + + + diff --git a/res/layout-land/fingerprint_enroll_enrolling.xml b/res/layout-land/fingerprint_enroll_enrolling.xml index c60888b5ab..4d02c07fb5 100644 --- a/res/layout-land/fingerprint_enroll_enrolling.xml +++ b/res/layout-land/fingerprint_enroll_enrolling.xml @@ -69,7 +69,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" - android:layout_gravity="center_horizontal|bottom"/> + android:layout_gravity="center_horizontal|bottom" + android:visibility="invisible"/> diff --git a/res/layout/fingerprint_enroll_enrolling_base.xml b/res/layout/fingerprint_enroll_enrolling_base.xml index 37e10bae5c..21221cf2e8 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"/> diff --git a/res/layout/fingerprint_enroll_enrolling_content.xml b/res/layout/fingerprint_enroll_enrolling_content.xml index 9fa503b403..b3171a39ba 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"> - - + android:background="@drawable/fp_illustration_enrollment" + android:backgroundTint="@color/fingerprint_indicator_background_resting" + android:src="@drawable/enrollment_fingerprint_isolated_animation"/>