diff options
| author | Maurice Lam <yukl@google.com> | 2015-07-09 16:38:37 -0700 |
|---|---|---|
| committer | Maurice Lam <yukl@google.com> | 2015-07-15 11:14:22 -0700 |
| commit | 8d1f9c9be50439fa3f5f50fbe473e43ba6b77eb6 (patch) | |
| tree | 04488c8b1eb35999f3bde3dd59476c5b39552415 /res/layout-land | |
| parent | e1eaed079c250146b8e10d6d37e530ecfd42f432 (diff) | |
| download | packages_apps_Settings-8d1f9c9be50439fa3f5f50fbe473e43ba6b77eb6.zip packages_apps_Settings-8d1f9c9be50439fa3f5f50fbe473e43ba6b77eb6.tar.gz packages_apps_Settings-8d1f9c9be50439fa3f5f50fbe473e43ba6b77eb6.tar.bz2 | |
[Fingerprint] Add fingerprint enroll in setup wizard
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
Diffstat (limited to 'res/layout-land')
| -rw-r--r-- | res/layout-land/fingerprint_enroll_enrolling.xml | 2 | ||||
| -rw-r--r-- | res/layout-land/fingerprint_enroll_find_sensor.xml | 2 | ||||
| -rw-r--r-- | res/layout-land/fingerprint_enroll_finish.xml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/res/layout-land/fingerprint_enroll_enrolling.xml b/res/layout-land/fingerprint_enroll_enrolling.xml index 4d02c07..8577f5f 100644 --- a/res/layout-land/fingerprint_enroll_enrolling.xml +++ b/res/layout-land/fingerprint_enroll_enrolling.xml @@ -20,7 +20,7 @@ android:id="@+id/setup_wizard_layout" android:layout_width="match_parent" android:layout_height="match_parent" - style="@style/SetupWizardFingerprintStyle"> + style="?attr/fingerprint_layout_theme"> <LinearLayout style="@style/SuwContentFrame" diff --git a/res/layout-land/fingerprint_enroll_find_sensor.xml b/res/layout-land/fingerprint_enroll_find_sensor.xml index b340193..81d1dac 100644 --- a/res/layout-land/fingerprint_enroll_find_sensor.xml +++ b/res/layout-land/fingerprint_enroll_find_sensor.xml @@ -20,7 +20,7 @@ android:id="@+id/setup_wizard_layout" android:layout_width="match_parent" android:layout_height="match_parent" - style="@style/SetupWizardFingerprintStyle"> + style="?attr/fingerprint_layout_theme"> <LinearLayout style="@style/SuwContentFrame" diff --git a/res/layout-land/fingerprint_enroll_finish.xml b/res/layout-land/fingerprint_enroll_finish.xml index aeadd5d..d70dc84 100644 --- a/res/layout-land/fingerprint_enroll_finish.xml +++ b/res/layout-land/fingerprint_enroll_finish.xml @@ -20,7 +20,7 @@ android:id="@+id/setup_wizard_layout" android:layout_width="match_parent" android:layout_height="match_parent" - style="@style/SetupWizardFingerprintStyle"> + style="?attr/fingerprint_layout_theme"> <LinearLayout style="@style/SuwContentFrame" |