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 
am: 56787e3e54

Change-Id: Ic30a63d3043a04aeeac04d65a747897b91e1831b
This commit is contained in:
Ajay Kumar Nadathur Sreenivasan
2017-07-07 21:33:47 +00:00
committed by android-build-merger
parent ef7f6663ef 56787e3e54
commit 3fafe7cf22
2 changed files with 94 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,10 @@
android:layout="@layout/suw_glif_blank_template" android:layout="@layout/suw_glif_blank_template"
style="?attr/fingerprint_layout_theme"> style="?attr/fingerprint_layout_theme">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true">
<LinearLayout <LinearLayout
style="@style/SuwContentFrame" style="@style/SuwContentFrame"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -97,10 +101,12 @@
</LinearLayout> </LinearLayout>
<FrameLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<include layout="@layout/fingerprint_enroll_enrolling_content" <include layout="@layout/fingerprint_enroll_enrolling_content"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -115,10 +121,13 @@
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:layout_gravity="center_horizontal|bottom" android:layout_gravity="center_horizontal|bottom"
android:accessibilityLiveRegion="polite" android:accessibilityLiveRegion="polite"
android:gravity="center_horizontal"
android:paddingEnd="5dp"
android:paddingStart="5dp"
android:visibility="invisible"/> android:visibility="invisible"/>
</FrameLayout>
</LinearLayout> </LinearLayout>
</LinearLayout>
</ScrollView>
</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>