Update fingerprint enroll UI to spec.
Also adds sliding animations between the steps. Bug: 20495507 Change-Id: I148d8d8b8082361149f02fd2dc4cead0ba3e2526
This commit is contained in:
@@ -18,5 +18,8 @@
|
||||
<item name="notification_app_section" type="layout">@*android:layout/preference_category_material</item>
|
||||
<item name="confirm_lock_pattern" type="layout">@layout/confirm_lock_pattern_base</item>
|
||||
<item name="confirm_lock_password" type="layout">@layout/confirm_lock_password_base</item>
|
||||
<item name="fingerprint_enroll_find_sensor" type="layout">@layout/fingerprint_enroll_find_sensor_base</item>
|
||||
<item name="fingerprint_enroll_enrolling" type="layout">@layout/fingerprint_enroll_enrolling_base</item>
|
||||
<item name="fingerprint_enroll_finish" type="layout">@layout/fingerprint_enroll_finish_base</item>
|
||||
</resources>
|
||||
|
||||
|
@@ -83,4 +83,6 @@
|
||||
<color name="fab_ripple">#1fffffff</color><!-- 12% white -->
|
||||
<color name="fab_shape">#ff009688</color><!-- Teal 500 -->
|
||||
<color name="voice_interaction_highlight">#33b5e5</color>
|
||||
|
||||
<drawable name="fp_enrollment_header_landscape">#009688</drawable>
|
||||
</resources>
|
||||
|
@@ -37,4 +37,5 @@
|
||||
|
||||
<!-- The duration (in milliseconds) of activity transitions -->
|
||||
<integer name="setup_wizard_transition_duration">300</integer>
|
||||
|
||||
</resources>
|
||||
|
@@ -217,8 +217,10 @@
|
||||
<dimen name="redaction_vertical_margins">8dp</dimen>
|
||||
|
||||
<!-- Fingerprint -->
|
||||
<dimen name="fingerprint_ring_radius">96dip</dimen>
|
||||
<dimen name="fingerprint_ring_radius">92dip</dimen>
|
||||
<dimen name="fingerprint_ring_thickness">4dip</dimen>
|
||||
<item name="fingerprint_illustration_aspect_ratio" format="float" type="dimen">2.6</item>
|
||||
<dimen name="fingerprint_decor_padding_top">0dp</dimen>
|
||||
|
||||
<dimen name="confirm_credentials_security_method_margin">48dp</dimen>
|
||||
<dimen name="fab_size">56dp</dimen>
|
||||
|
@@ -752,15 +752,20 @@
|
||||
<string name="security_settings_fingerprint_enroll_onboard_title">Fingerprint setup</string>
|
||||
<!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
|
||||
alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
|
||||
<string name="security_settings_fingerprint_enroll_onboard_message">
|
||||
To use your fingerprint to unlock your screen or confirm purchases, we\'ll need to:
|
||||
\n\n\u2713 Set up your backup screen lock method
|
||||
\n\n\u2713 Add your fingerprint</string>
|
||||
<string name="security_settings_fingerprint_enroll_onboard_message">To use your fingerprint to unlock your screen or confirm purchases, we\'ll need to:</string>
|
||||
<!-- Introduction message shown in fingerprint enrollment dialog, first item to describe what
|
||||
the user needs to do. -->
|
||||
<string name="security_settings_fingerprint_enroll_onboard_message_1">Setup your backup screen lock method</string>
|
||||
<!-- Introduction message shown in fingerprint enrollment dialog, second item to describe what
|
||||
the user needs to do. -->
|
||||
<string name="security_settings_fingerprint_enroll_onboard_message_2">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>
|
||||
<!-- Content description of graphic that shows where the fingerprint of the device is [CHAR LIMIT=NONE] -->
|
||||
<string name="security_settings_fingerprint_enroll_find_sensor_content_description">Illustration with device and fingerprint sensor location</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] -->
|
||||
@@ -779,8 +784,12 @@
|
||||
<string name="security_settings_fingerprint_enroll_finish_title">Fingerprint added!</string>
|
||||
<!-- Message shown in fingerprint enrollment dialog once enrollment is completed -->
|
||||
<string name="security_settings_fingerprint_enroll_finish_message">Whenever you see this icon, you can use your fingerprint for identification or to authorize a purchase.</string>
|
||||
<!-- Button text to setup screen lock in onboard dialog [CHAR LIMIT=34] -->
|
||||
<string name="security_settings_fingerprint_enroll_setup_screen_lock">Setup screen lock</string>
|
||||
<!-- Button text to exit fingerprint wizard after everything is done [CHAR LIMIT=15] -->
|
||||
<string name="security_settings_fingerprint_enroll_done">Done</string>
|
||||
<!-- Button text shown at the end of enrollment that allows the user to add another fingerprint -->
|
||||
<string name="fingerprint_enroll_button_add">Add</string>
|
||||
<string name="fingerprint_enroll_button_add">Add another</string>
|
||||
<!-- Button text shown at the end of enrollment that allows the user to move to the next step -->
|
||||
<string name="fingerprint_enroll_button_next">Next</string>
|
||||
|
||||
|
@@ -296,18 +296,26 @@
|
||||
<style name="TextAppearance.RecentsTitle" parent="TextAppearance.CategoryTitle" />
|
||||
<style name="TextAppearance.ResultTitle" parent="TextAppearance.CategoryTitle" />
|
||||
|
||||
<style name="TextAppearance.FingerprintTitle"
|
||||
parent="android:TextAppearance.Material.Large.Inverse">
|
||||
<item name="android:textStyle">bold</item>
|
||||
<item name="android:textSize">24sp</item>
|
||||
<item name="android:textColor">@color/fingerprint_title_color</item>
|
||||
<style name="TextAppearance.FingerprintMessage"
|
||||
parent="android:TextAppearance.Material.Subhead">
|
||||
<item name="android:lineSpacingExtra">@dimen/suw_description_line_spacing_extra</item>
|
||||
</style>
|
||||
|
||||
<style name="TextAppearance.FingerprintMessage"
|
||||
parent="android:TextAppearance.Material.Medium.Inverse">
|
||||
<item name="android:textStyle">bold</item>
|
||||
<item name="android:textSize">16sp</item>
|
||||
<item name="android:textColor">@color/fingerprint_message_color</item>
|
||||
<style name="Button.FingerprintButton"
|
||||
parent="android:Widget.Material.Button.Borderless">
|
||||
<item name="android:lineSpacingExtra">@dimen/suw_description_line_spacing_extra</item>
|
||||
<item name="android:textColor">?android:attr/colorAccent</item>
|
||||
</style>
|
||||
|
||||
<style name="TextAppearance.FingerprintErrorText"
|
||||
parent="android:TextAppearance.Material.Caption">
|
||||
<item name="android:textColor">@color/warning</item>
|
||||
</style>
|
||||
|
||||
<style name="SetupWizardFingerprintStyle">
|
||||
<item name="suwBackground">@drawable/fp_enrollment_header</item>
|
||||
<item name="suwIllustrationAspectRatio">@dimen/fingerprint_illustration_aspect_ratio</item>
|
||||
<item name="suwDecorPaddingTop">@dimen/fingerprint_decor_padding_top</item>
|
||||
</style>
|
||||
|
||||
<style name="TextAppearance.ConfirmDeviceCredentialsErrorText"
|
||||
|
@@ -219,4 +219,8 @@
|
||||
<item name="@*android:successColor">@color/lock_pattern_view_regular_color_dark</item>
|
||||
<item name="@*android:errorColor">@color/lock_pattern_view_error_color</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.FingerprintEnroll" parent="@android:style/Theme.Material.Light.NoActionBar">
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
Reference in New Issue
Block a user