diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-07-27 17:31:23 -0700 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2015-07-27 17:31:58 -0700 |
| commit | 9b456e5f9d4e1fbd2dad939c5add8bf997dd9b9e (patch) | |
| tree | 3ae18b7c44f85e34a7a9de71a825e9b3b4257a04 /res/layout | |
| parent | 32b96646eec917987fdd38208c6b11a9bc8832d3 (diff) | |
| download | packages_apps_Settings-9b456e5f9d4e1fbd2dad939c5add8bf997dd9b9e.zip packages_apps_Settings-9b456e5f9d4e1fbd2dad939c5add8bf997dd9b9e.tar.gz packages_apps_Settings-9b456e5f9d4e1fbd2dad939c5add8bf997dd9b9e.tar.bz2 | |
Adjust enrollment UI for sw400 devices
Bug: 22511825
Change-Id: Id2534a6a4ea99c295aa6ff583ff7755e5dfa339b
Diffstat (limited to 'res/layout')
4 files changed, 18 insertions, 11 deletions
diff --git a/res/layout/fingerprint_enroll_enrolling_base.xml b/res/layout/fingerprint_enroll_enrolling_base.xml index 23ffa69..692961f 100644 --- a/res/layout/fingerprint_enroll_enrolling_base.xml +++ b/res/layout/fingerprint_enroll_enrolling_base.xml @@ -57,8 +57,8 @@ <include layout="@layout/fingerprint_enroll_enrolling_content" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="36dp" - android:layout_gravity="center_horizontal"/> + android:layout_gravity="center_horizontal" + android:layout_marginTop="@dimen/fingerprint_enrolling_content_margin_top"/> <TextView style="@style/TextAppearance.FingerprintErrorText" diff --git a/res/layout/fingerprint_enroll_enrolling_content.xml b/res/layout/fingerprint_enroll_enrolling_content.xml index b3171a3..fd6d726 100644 --- a/res/layout/fingerprint_enroll_enrolling_content.xml +++ b/res/layout/fingerprint_enroll_enrolling_content.xml @@ -19,13 +19,12 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="36dp" android:layout_gravity="center_horizontal"> <ImageView android:id="@+id/fingerprint_animator" - android:layout_width="88dp" - android:layout_height="88dp" + android:layout_width="@dimen/fingerprint_animation_size" + android:layout_height="@dimen/fingerprint_animation_size" android:layout_centerInParent="true" android:background="@drawable/fp_illustration_enrollment" android:backgroundTint="@color/fingerprint_indicator_background_resting" @@ -33,8 +32,8 @@ <ProgressBar android:id="@+id/fingerprint_progress_bar" - android:layout_width="192dp" - android:layout_height="192dp" + android:layout_width="@dimen/fingerprint_progress_bar_size" + android:layout_height="@dimen/fingerprint_progress_bar_size" android:layout_centerInParent="true" style="?android:attr/progressBarStyleHorizontal" android:max="10000" diff --git a/res/layout/fingerprint_enroll_find_sensor_base.xml b/res/layout/fingerprint_enroll_find_sensor_base.xml index cbb6466..f65e932 100644 --- a/res/layout/fingerprint_enroll_find_sensor_base.xml +++ b/res/layout/fingerprint_enroll_find_sensor_base.xml @@ -37,9 +37,13 @@ android:layout_marginTop="@dimen/suw_description_margin_top" android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/> + <View + android:layout_height="0dp" + android:layout_width="match_parent" + android:layout_weight="1"/> + <include layout="@layout/fingerprint_enroll_find_sensor_graphic" - android:layout_marginTop="32dp" android:layout_width="@dimen/fingerprint_find_sensor_graphic_size" android:layout_height="@dimen/fingerprint_find_sensor_graphic_size" android:layout_gravity="center_horizontal"/> diff --git a/res/layout/fingerprint_enroll_finish_base.xml b/res/layout/fingerprint_enroll_finish_base.xml index 4e641df..0f4b7e8 100644 --- a/res/layout/fingerprint_enroll_finish_base.xml +++ b/res/layout/fingerprint_enroll_finish_base.xml @@ -37,11 +37,15 @@ android:layout_marginTop="@dimen/suw_description_margin_top" android:text="@string/security_settings_fingerprint_enroll_finish_message"/> + <View + android:layout_height="0dp" + android:layout_width="match_parent" + android:layout_weight="1"/> + <ImageView android:id="@+id/fingerprint_in_app_indicator" - android:layout_width="120dp" - android:layout_height="120dp" - android:layout_marginTop="56dp" + android:layout_width="@dimen/fingerprint_in_app_indicator_size" + android:layout_height="@dimen/fingerprint_in_app_indicator_size" android:layout_gravity="center_horizontal" android:src="@drawable/fp_app_indicator" /> |