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

Merge "Fingerprint added graphic is bigger than enrolling progressbar" into oc-mr1-dev

Browse Source 
am: 1908c4010b

Change-Id: I949aa81a0a88be0824590d85a50400b1b1268d3f
This commit is contained in:
Ajay Nadathur
2017-08-03 16:51:06 +00:00
committed by android-build-merger
parent 413d71d400 1908c4010b
commit 1f2317c4b4
4 changed files with 54 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,10 +108,18 @@
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<com.android.setupwizardlib.view.FillContentLayout
android:layout_width="@dimen/fingerprint_progress_bar_max_size"
android:layout_height="@dimen/fingerprint_progress_bar_max_size"
android:paddingTop="0dp"
android:paddingBottom="0dp"
android:layout_marginVertical="24dp">
<include layout="@layout/fingerprint_enroll_enrolling_content" <include layout="@layout/fingerprint_enroll_enrolling_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" /> android:layout_gravity="center" />
</com.android.setupwizardlib.view.FillContentLayout>
<TextView <TextView
style="@style/TextAppearance.FingerprintErrorText" style="@style/TextAppearance.FingerprintErrorText"

13
res/layout/fingerprint_enroll_enrolling_base.xml
View File

@@ -64,11 +64,18 @@
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<include layout="@layout/fingerprint_enroll_enrolling_content" <com.android.setupwizardlib.view.FillContentLayout
android:layout_width="@dimen/fingerprint_progress_bar_max_size" android:layout_width="@dimen/fingerprint_progress_bar_max_size"
android:layout_height="@dimen/fingerprint_progress_bar_max_size" android:layout_height="@dimen/fingerprint_progress_bar_max_size"
android:layout_gravity="center" android:paddingTop="0dp"
android:layout_marginVertical="24dp"/> android:paddingBottom="0dp"
android:layout_marginVertical="24dp">
<include layout="@layout/fingerprint_enroll_enrolling_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center" />
</com.android.setupwizardlib.view.FillContentLayout>
<TextView <TextView
style="@style/TextAppearance.FingerprintErrorText" style="@style/TextAppearance.FingerprintErrorText"

4
res/layout/fingerprint_enroll_enrolling_content.xml
View File

@@ -18,8 +18,8 @@
<com.android.settings.widget.RingProgressBar <com.android.settings.widget.RingProgressBar
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/fingerprint_progress_bar" android:id="@+id/fingerprint_progress_bar"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:background="@drawable/fp_illustration" android:background="@drawable/fp_illustration"
android:minHeight="@dimen/fingerprint_progress_bar_min_size" android:minHeight="@dimen/fingerprint_progress_bar_min_size"
android:progress="0" /> android:progress="0" />

28
res/layout/fingerprint_enroll_finish_base.xml
View File

@@ -41,23 +41,41 @@
android:minLines="3" 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 <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_weight="1" android:layout_weight="1"
android:maxWidth="@dimen/fingerprint_finish_max_size" android:gravity="center"
android:maxHeight="@dimen/fingerprint_finish_max_size"> android:orientation="vertical">
<com.android.setupwizardlib.view.FillContentLayout
android:layout_width="@dimen/fingerprint_progress_bar_max_size"
android:layout_height="@dimen/fingerprint_progress_bar_max_size"
android:layout_marginVertical="24dp"
android:paddingTop="0dp"
android:paddingBottom="0dp"
android:gravity="center|center_horizontal">
<ImageView <ImageView
android:id="@+id/fingerprint_in_app_indicator" android:id="@+id/fingerprint_in_app_indicator"
style="@style/SuwContentIllustration" style="@style/SuwContentIllustration"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="7dp"
android:contentDescription="@android:string/fingerprint_icon_content_description" android:contentDescription="@android:string/fingerprint_icon_content_description"
android:src="@drawable/fp_app_indicator" /> android:src="@drawable/fp_app_indicator" />
</com.android.setupwizardlib.view.FillContentLayout> </com.android.setupwizardlib.view.FillContentLayout>
<!-- Added to align elements with fingerprint_enroll_enrolling_base -->
<TextView
style="@style/TextAppearance.FingerprintErrorText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom"
android:visibility="invisible" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</com.android.setupwizardlib.GlifLayout> </com.android.setupwizardlib.GlifLayout>