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

Merge "Align fingerprint illustration size" into oc-dr1-dev

Browse Source
This commit is contained in:
Maurice Lam
2017-06-20 19:56:49 +00:00
committed by Android (Google) Code Review
parent 6dfafa5d95 a57730aa57
commit 3065eeff42
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 -->
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_glif_margin_top">
android:layout_height="wrap_content">
<TextView
style="@style/SuwDescription.Glif"
android:id="@+id/start_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minLines="3"
android:text="@string/security_settings_fingerprint_enroll_start_message"/>
<TextView
@@ -49,27 +49,36 @@
android:id="@+id/repeat_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minLines="3"
android:text="@string/security_settings_fingerprint_enroll_repeat_message"
android:visibility="invisible"/>
</FrameLayout>
<include layout="@layout/fingerprint_enroll_enrolling_content"
android:layout_width="@dimen/fingerprint_progress_bar_max_size"
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/fingerprint_enrolling_content_margin_top"/>
android:paddingBottom="80dp">
<TextView
style="@style/TextAppearance.FingerprintErrorText"
android:id="@+id/error_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:layout_gravity="center_horizontal"
android:accessibilityLiveRegion="polite"
android:visibility="invisible"/>
<include layout="@layout/fingerprint_enroll_enrolling_content"
android:layout_width="@dimen/fingerprint_progress_bar_max_size"
android:layout_height="@dimen/fingerprint_progress_bar_max_size"
android:layout_gravity="center"
android:layout_marginVertical="24dp"/>
<TextView
style="@style/TextAppearance.FingerprintErrorText"
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>

7
res/layout/fingerprint_enroll_finish_base.xml
View File

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