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

Align fingerprint illustration size

Browse Source 
Test: Manual
Bug: 62677095
Change-Id: I352bf5e20f4ce254d0777dfd544f4604f5c86dcb
This commit is contained in:
Maurice Lam
2017-06-16 21:34:34 -07:00
parent b275471725
commit a57730aa57
4 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
res/layout/fingerprint_enroll_enrolling_base.xml
View File

@@ -34,14 +34,14 @@
switch the text --> switch the text -->
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_marginTop="@dimen/suw_description_glif_margin_top">
<TextView <TextView
style="@style/SuwDescription.Glif" style="@style/SuwDescription.Glif"
android:id="@+id/start_message" android:id="@+id/start_message"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minLines="3"
android:text="@string/security_settings_fingerprint_enroll_start_message"/> android:text="@string/security_settings_fingerprint_enroll_start_message"/>
<TextView <TextView
@@ -49,27 +49,36 @@
android:id="@+id/repeat_message" android:id="@+id/repeat_message"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minLines="3"
android:text="@string/security_settings_fingerprint_enroll_repeat_message" android:text="@string/security_settings_fingerprint_enroll_repeat_message"
android:visibility="invisible"/> android:visibility="invisible"/>
</FrameLayout> </FrameLayout>
<include layout="@layout/fingerprint_enroll_enrolling_content" <FrameLayout
android:layout_width="@dimen/fingerprint_progress_bar_max_size" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" android:layout_weight="1"
android:layout_gravity="center_horizontal" android:paddingBottom="80dp">
android:layout_marginTop="@dimen/fingerprint_enrolling_content_margin_top"/>
<TextView <include layout="@layout/fingerprint_enroll_enrolling_content"
style="@style/TextAppearance.FingerprintErrorText" android:layout_width="@dimen/fingerprint_progress_bar_max_size"
android:id="@+id/error_text" android:layout_height="@dimen/fingerprint_progress_bar_max_size"
android:layout_width="wrap_content" android:layout_gravity="center"
android:layout_height="wrap_content" android:layout_marginVertical="24dp"/>
android:layout_marginTop="24dp"
android:layout_gravity="center_horizontal" <TextView
android:accessibilityLiveRegion="polite" style="@style/TextAppearance.FingerprintErrorText"
android:visibility="invisible"/> android:id="@+id/error_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:layout_gravity="center_horizontal|bottom"
android:accessibilityLiveRegion="polite"
android:gravity="center"
android:visibility="invisible"/>
</FrameLayout>
</LinearLayout> </LinearLayout>

7
res/layout/fingerprint_enroll_finish_base.xml
View File

@@ -38,12 +38,15 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_glif_margin_top" android:layout_marginTop="@dimen/suw_description_glif_margin_top"
android:minLines="3"
android:text="@string/security_settings_fingerprint_enroll_finish_message"/> android:text="@string/security_settings_fingerprint_enroll_finish_message"/>
<com.android.setupwizardlib.view.FillContentLayout <com.android.setupwizardlib.view.FillContentLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_weight="1"> android:layout_weight="1"
android:maxWidth="@dimen/fingerprint_finish_max_size"
android:maxHeight="@dimen/fingerprint_finish_max_size">
<ImageView <ImageView
android:id="@+id/fingerprint_in_app_indicator" android:id="@+id/fingerprint_in_app_indicator"

2
res/values-sw400dp/dimens.xml
View File

@@ -16,7 +16,7 @@
--> -->
<resources> <resources>
<dimen name="fingerprint_enrolling_content_margin_top">56dp</dimen> <dimen name="fingerprint_enrolling_content_margin_vertical">56dp</dimen>
<dimen name="fingerprint_find_sensor_graphic_size">240dp</dimen> <dimen name="fingerprint_find_sensor_graphic_size">240dp</dimen>
<dimen name="support_escalation_card_padding_start">56dp</dimen> <dimen name="support_escalation_card_padding_start">56dp</dimen>

8
res/values/dimens.xml
View File

@@ -225,9 +225,13 @@
<dimen name="fingerprint_error_text_appear_distance">16dp</dimen> <dimen name="fingerprint_error_text_appear_distance">16dp</dimen>
<dimen name="fingerprint_error_text_disappear_distance">-8dp</dimen> <dimen name="fingerprint_error_text_disappear_distance">-8dp</dimen>
<dimen name="fingerprint_animation_size">88dp</dimen> <dimen name="fingerprint_animation_size">88dp</dimen>
<dimen name="fingerprint_progress_bar_max_size">220dp</dimen> <dimen name="fingerprint_progress_bar_max_size">240dp</dimen>
<dimen name="fingerprint_progress_bar_min_size">120dp</dimen> <dimen name="fingerprint_progress_bar_min_size">120dp</dimen>
<dimen name="fingerprint_enrolling_content_margin_top">36dp</dimen> <dimen name="fingerprint_enrolling_content_margin_vertical">24dp</dimen>
<!-- To be the same size as fingerprint progress bar:
fingerprint_finish_max_size = fingerprint_progress_bar_max_size
+ (fingerprint_enrolling_content_margin_vertical x 2) -->
<dimen name="fingerprint_finish_max_size">288dp</dimen>
<dimen name="confirm_credentials_security_method_margin">48dp</dimen> <dimen name="confirm_credentials_security_method_margin">48dp</dimen>
<dimen name="confirm_credentials_layout_width">@dimen/match_parent</dimen> <dimen name="confirm_credentials_layout_width">@dimen/match_parent</dimen>