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

Merge "Overlapping text over fingerprint animation" into oc-dr1-dev

Browse Source
This commit is contained in:
Ajay Kumar Nadathur Sreenivasan
2017-07-07 21:29:07 +00:00
committed by Android (Google) Code Review
parent db522a539d 715713d524
commit 56787e3e54
2 changed files with 94 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

169
res/layout-land/fingerprint_enroll_enrolling.xml
View File

@@ -23,102 +23,111 @@
android:layout="@layout/suw_glif_blank_template" android:layout="@layout/suw_glif_blank_template"
style="?attr/fingerprint_layout_theme"> style="?attr/fingerprint_layout_theme">
<LinearLayout <ScrollView
style="@style/SuwContentFrame"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal" android:fillViewport="true">
android:clipToPadding="false"
android:clipChildren="false"
android:paddingBottom="0dp">
<!-- Both texts are kept as separate text views so it doesn't jump around in portrait.
See layouts/fingerprint_enroll_enrolling_base.xml. -->
<LinearLayout <LinearLayout
android:layout_width="0dp" style="@style/SuwContentFrame"
android:layout_weight="1" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginStart="?attr/suwMarginSides" android:orientation="horizontal"
android:layout_marginBottom="@dimen/suw_content_frame_padding_bottom"
android:clipChildren="false"
android:clipToPadding="false" android:clipToPadding="false"
android:orientation="vertical"> android:clipChildren="false"
android:paddingBottom="0dp">
<ImageView <!-- Both texts are kept as separate text views so it doesn't jump around in portrait.
android:id="@+id/suw_layout_icon" See layouts/fingerprint_enroll_enrolling_base.xml. -->
style="@style/SuwGlifIcon" <LinearLayout
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_weight="1"
android:layout_gravity="?attr/suwGlifHeaderGravity" android:layout_height="match_parent"
android:layout_marginStart="0dp" android:layout_marginStart="?attr/suwMarginSides"
android:layout_marginEnd="0dp" android:layout_marginBottom="@dimen/suw_content_frame_padding_bottom"
android:src="@drawable/ic_fingerprint_header" /> android:clipChildren="false"
android:clipToPadding="false"
android:orientation="vertical">
<TextView <ImageView
android:id="@+id/suw_layout_title" android:id="@+id/suw_layout_icon"
style="@style/SuwGlifHeaderTitle" style="@style/SuwGlifIcon"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="0dp" android:layout_gravity="?attr/suwGlifHeaderGravity"
android:layout_marginEnd="0dp" /> android:layout_marginStart="0dp"
android:layout_marginEnd="0dp"
<FrameLayout android:src="@drawable/ic_fingerprint_header" />
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView <TextView
style="@style/SuwDescription.Glif" android:id="@+id/suw_layout_title"
android:id="@+id/start_message" style="@style/SuwGlifHeaderTitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/security_settings_fingerprint_enroll_start_message"/> android:layout_marginStart="0dp"
android:layout_marginEnd="0dp" />
<FrameLayout
android:layout_width="match_parent"
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:text="@string/security_settings_fingerprint_enroll_start_message"/>
<TextView
style="@style/SuwDescription.Glif"
android:id="@+id/repeat_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/security_settings_fingerprint_enroll_repeat_message"
android:visibility="invisible"/>
</FrameLayout>
<Space
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<Button
android:id="@+id/skip_button"
style="@style/SuwGlifButton.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/security_settings_fingerprint_enroll_enrolling_skip" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<include layout="@layout/fingerprint_enroll_enrolling_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"/>
<TextView <TextView
style="@style/SuwDescription.Glif" style="@style/TextAppearance.FingerprintErrorText"
android:id="@+id/repeat_message" android:id="@+id/error_text"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/security_settings_fingerprint_enroll_repeat_message" android:layout_marginBottom="16dp"
android:layout_gravity="center_horizontal|bottom"
android:accessibilityLiveRegion="polite"
android:gravity="center_horizontal"
android:paddingEnd="5dp"
android:paddingStart="5dp"
android:visibility="invisible"/> android:visibility="invisible"/>
</FrameLayout> </LinearLayout>
<Space
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<Button
android:id="@+id/skip_button"
style="@style/SuwGlifButton.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/security_settings_fingerprint_enroll_enrolling_skip" />
</LinearLayout> </LinearLayout>
</ScrollView>
<FrameLayout
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent">
<include layout="@layout/fingerprint_enroll_enrolling_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"/>
<TextView
style="@style/TextAppearance.FingerprintErrorText"
android:id="@+id/error_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_gravity="center_horizontal|bottom"
android:accessibilityLiveRegion="polite"
android:visibility="invisible"/>
</FrameLayout>
</LinearLayout>
</com.android.setupwizardlib.GlifLayout> </com.android.setupwizardlib.GlifLayout>

9
res/layout/fingerprint_enroll_enrolling_base.xml
View File

@@ -57,10 +57,12 @@
</FrameLayout> </FrameLayout>
<FrameLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1"> android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<include layout="@layout/fingerprint_enroll_enrolling_content" <include layout="@layout/fingerprint_enroll_enrolling_content"
android:layout_width="@dimen/fingerprint_progress_bar_max_size" android:layout_width="@dimen/fingerprint_progress_bar_max_size"
@@ -73,13 +75,12 @@
android:id="@+id/error_text" android:id="@+id/error_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:layout_gravity="center_horizontal|bottom" android:layout_gravity="center_horizontal|bottom"
android:accessibilityLiveRegion="polite" android:accessibilityLiveRegion="polite"
android:gravity="center" android:gravity="center"
android:visibility="invisible"/> android:visibility="invisible"/>
</FrameLayout> </LinearLayout>
</LinearLayout> </LinearLayout>