diff options
author | Jorim Jaggi <jjaggi@google.com> | 2015-07-28 19:50:47 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-28 19:50:47 +0000 |
commit | 74af384cae9ea03f900c6f3aed2581477dedf68a (patch) | |
tree | e335291c9232f5b3a8e9aeaf00481fe59bf8bf24 | |
parent | 4d9f5c91aeb7ab1ab9828bce45d5f0a7c3ba0716 (diff) | |
parent | 9b456e5f9d4e1fbd2dad939c5add8bf997dd9b9e (diff) | |
download | packages_apps_Settings-74af384cae9ea03f900c6f3aed2581477dedf68a.zip packages_apps_Settings-74af384cae9ea03f900c6f3aed2581477dedf68a.tar.gz packages_apps_Settings-74af384cae9ea03f900c6f3aed2581477dedf68a.tar.bz2 |
Merge "Adjust enrollment UI for sw400 devices" into mnc-dev
-rw-r--r-- | res/layout-land/fingerprint_enroll_enrolling.xml | 5 | ||||
-rw-r--r-- | res/layout-land/fingerprint_enroll_finish.xml | 4 | ||||
-rw-r--r-- | res/layout/fingerprint_enroll_enrolling_base.xml | 4 | ||||
-rw-r--r-- | res/layout/fingerprint_enroll_enrolling_content.xml | 9 | ||||
-rw-r--r-- | res/layout/fingerprint_enroll_find_sensor_base.xml | 6 | ||||
-rw-r--r-- | res/layout/fingerprint_enroll_finish_base.xml | 10 | ||||
-rwxr-xr-x | res/values-sw400dp/dimens.xml | 24 | ||||
-rwxr-xr-x | res/values/dimens.xml | 4 |
8 files changed, 52 insertions, 14 deletions
diff --git a/res/layout-land/fingerprint_enroll_enrolling.xml b/res/layout-land/fingerprint_enroll_enrolling.xml index 8577f5f..c72c029 100644 --- a/res/layout-land/fingerprint_enroll_enrolling.xml +++ b/res/layout-land/fingerprint_enroll_enrolling.xml @@ -61,7 +61,10 @@ android:layout_weight="1" android:layout_height="match_parent"> - <include layout="@layout/fingerprint_enroll_enrolling_content"/> + <include layout="@layout/fingerprint_enroll_enrolling_content" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center"/> <TextView style="@style/TextAppearance.FingerprintErrorText" diff --git a/res/layout-land/fingerprint_enroll_finish.xml b/res/layout-land/fingerprint_enroll_finish.xml index 558866c..f1bf885 100644 --- a/res/layout-land/fingerprint_enroll_finish.xml +++ b/res/layout-land/fingerprint_enroll_finish.xml @@ -79,8 +79,8 @@ <ImageView android:id="@+id/fingerprint_in_app_indicator" - android:layout_width="120dp" - android:layout_height="120dp" + android:layout_width="@dimen/fingerprint_in_app_indicator_size" + android:layout_height="@dimen/fingerprint_in_app_indicator_size" android:layout_gravity="center_horizontal" android:contentDescription="@android:string/fingerprint_icon_content_description" android:src="@drawable/fp_app_indicator" /> 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 e0e261e..3ca5dfc 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:contentDescription="@android:string/fingerprint_icon_content_description" android:src="@drawable/fp_app_indicator" /> diff --git a/res/values-sw400dp/dimens.xml b/res/values-sw400dp/dimens.xml new file mode 100755 index 0000000..fcc9c6f --- /dev/null +++ b/res/values-sw400dp/dimens.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> + +<resources> + <dimen name="fingerprint_ring_radius">106dp</dimen> + <dimen name="fingerprint_animation_size">100dp</dimen> + <dimen name="fingerprint_progress_bar_size">220dp</dimen> + <dimen name="fingerprint_enrolling_content_margin_top">56dp</dimen> + <dimen name="fingerprint_in_app_indicator_size">176dp</dimen> +</resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index c10e83f..d41ff03 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -233,6 +233,10 @@ <dimen name="fingerprint_decor_padding_top">0dp</dimen> <dimen name="fingerprint_error_text_appear_distance">16dp</dimen> <dimen name="fingerprint_error_text_disappear_distance">-8dp</dimen> + <dimen name="fingerprint_animation_size">88dp</dimen> + <dimen name="fingerprint_progress_bar_size">192dp</dimen> + <dimen name="fingerprint_enrolling_content_margin_top">36dp</dimen> + <dimen name="fingerprint_in_app_indicator_size">120dp</dimen> <dimen name="confirm_credentials_security_method_margin">48dp</dimen> <dimen name="fab_size">56dp</dimen> |