PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fingerprint] Add fingerprint enroll in setup wizard

Browse Source 
Make a subclass for each enrolling screen that setup wizard uses, and
in override the corresponding get*Intent methods to always use the
setup wizard versions of the next screens.

On minor change made to the original flow is that it will now return
RESULT_OK if it is finished, as opposed to RESULT_CANCELED.

Bug: 21695577
Change-Id: Id666826e8027272ede6a5426967d66fb291670a4
This commit is contained in:
Maurice Lam
2015-07-09 16:38:37 -07:00
parent e1eaed079c
commit 8d1f9c9be5
22 changed files with 436 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/styles.xml
View File

@@ -327,12 +327,18 @@
<item name="android:textColor">@color/warning</item>
</style>
<style name="SetupWizardFingerprintStyle">
<style name="FingerprintLayoutTheme">
<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="SetupWizardFingerprintLayoutTheme">
<item name="suwBackgroundTile">@drawable/setup_illustration_tile</item>
<item name="suwIllustration">@drawable/setup_illustration_lock_screen</item>
<item name="suwIllustrationHorizontalTile">@drawable/setup_illustration_horizontal_tile</item>
</style>
<style name="TextAppearance.ConfirmDeviceCredentialsErrorText"
parent="android:TextAppearance.Material.Body1">
<item name="android:textColor">@color/warning</item>

4
res/values/themes.xml
View File

@@ -15,6 +15,7 @@
-->
<resources>
<attr name="fingerprint_layout_theme" format="reference" />
<attr name="ic_menu_add" format="reference" />
<attr name="ic_menu_moreoverflow" format="reference" />
<attr name="ic_wps" format="reference" />
@@ -36,6 +37,7 @@
<item name="android:listPreferredItemPaddingStart">@dimen/suw_layout_margin_sides</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
<item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
<item name="fingerprint_layout_theme">@style/SetupWizardFingerprintLayoutTheme</item>
<item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="ic_wps">@drawable/ic_wps_dark</item>
@@ -58,6 +60,7 @@
<item name="android:listPreferredItemPaddingStart">@dimen/suw_layout_margin_sides</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
<item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
<item name="fingerprint_layout_theme">@style/SetupWizardFingerprintLayoutTheme</item>
<item name="ic_menu_add">@drawable/ic_menu_add_light</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="ic_wps">@drawable/ic_wps_light</item>
@@ -90,6 +93,7 @@
<item name="apnPreferenceStyle">@style/ApnPreference</item>
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
<item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
<item name="ic_wps">@drawable/ic_wps_light</item>