diff options
| author | Maurice Lam <yukl@google.com> | 2015-07-15 19:28:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-15 19:28:06 +0000 |
| commit | 4595978b72eda7ed53ce0c0cbb763bed02ea13ab (patch) | |
| tree | 533f94ead9d8214f363d610f1086ab9876376a03 /res/layout | |
| parent | 6b9d788914a600917e8edd4ecd502d6ccf87ca12 (diff) | |
| parent | 8d1f9c9be50439fa3f5f50fbe473e43ba6b77eb6 (diff) | |
| download | packages_apps_Settings-4595978b72eda7ed53ce0c0cbb763bed02ea13ab.zip packages_apps_Settings-4595978b72eda7ed53ce0c0cbb763bed02ea13ab.tar.gz packages_apps_Settings-4595978b72eda7ed53ce0c0cbb763bed02ea13ab.tar.bz2 | |
Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/fingerprint_enroll_enrolling_base.xml | 2 | ||||
| -rw-r--r-- | res/layout/fingerprint_enroll_find_sensor_base.xml | 2 | ||||
| -rw-r--r-- | res/layout/fingerprint_enroll_finish_base.xml | 2 | ||||
| -rw-r--r-- | res/layout/fingerprint_enroll_introduction.xml | 3 | ||||
| -rw-r--r-- | res/layout/fingerprint_enroll_onboard.xml | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/res/layout/fingerprint_enroll_enrolling_base.xml b/res/layout/fingerprint_enroll_enrolling_base.xml index 21221cf..23ffa69 100644 --- a/res/layout/fingerprint_enroll_enrolling_base.xml +++ b/res/layout/fingerprint_enroll_enrolling_base.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/fingerprint_enroll_find_sensor_base.xml b/res/layout/fingerprint_enroll_find_sensor_base.xml index 9f1eb4b..cbb6466 100644 --- a/res/layout/fingerprint_enroll_find_sensor_base.xml +++ b/res/layout/fingerprint_enroll_find_sensor_base.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/fingerprint_enroll_finish_base.xml b/res/layout/fingerprint_enroll_finish_base.xml index 1c66103..4e641df 100644 --- a/res/layout/fingerprint_enroll_finish_base.xml +++ b/res/layout/fingerprint_enroll_finish_base.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/fingerprint_enroll_introduction.xml b/res/layout/fingerprint_enroll_introduction.xml index df83bd9..b05abd8 100644 --- a/res/layout/fingerprint_enroll_introduction.xml +++ b/res/layout/fingerprint_enroll_introduction.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" @@ -58,6 +58,7 @@ android:layout_weight="1"/> <LinearLayout + android:id="@+id/button_bar" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="-12dp" diff --git a/res/layout/fingerprint_enroll_onboard.xml b/res/layout/fingerprint_enroll_onboard.xml index efe90ae..4189137 100644 --- a/res/layout/fingerprint_enroll_onboard.xml +++ b/res/layout/fingerprint_enroll_onboard.xml @@ -19,7 +19,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" |