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

Merge "[Fingerprint] Make enroll progress bar scalable"

Browse Source
This commit is contained in:
Maurice Lam
2016-10-22 00:17:59 +00:00
committed by Android (Google) Code Review
parent a902a5bd93 67df126291
commit e9b7ec8f57
17 changed files with 254 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/layout/fingerprint_enroll_enrolling_base.xml
View File

@@ -55,8 +55,9 @@
</FrameLayout>
<include layout="@layout/fingerprint_enroll_enrolling_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/fingerprint_progress_bar_max_size"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/fingerprint_enrolling_content_margin_top"/>

31
res/layout/fingerprint_enroll_enrolling_content.xml
View File

@@ -15,32 +15,11 @@
~ limitations under the License
-->
<RelativeLayout
<com.android.settings.widget.RingProgressBar
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/fingerprint_progress_bar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal">
<ImageView
android:id="@+id/fingerprint_animator"
android:layout_width="@dimen/fingerprint_animation_size"
android:layout_height="@dimen/fingerprint_animation_size"
android:layout_centerInParent="true"
android:background="@drawable/fp_illustration_enrollment"
android:backgroundTint="@color/fingerprint_indicator_background_resting"
android:src="@drawable/enrollment_fingerprint_isolated_animation"/>
<ProgressBar
android:id="@+id/fingerprint_progress_bar"
android:layout_width="?attr/fingerprint_progress_bar_size"
android:layout_height="?attr/fingerprint_progress_bar_size"
android:layout_centerInParent="true"
style="?android:attr/progressBarStyleHorizontal"
android:max="10000"
android:mirrorForRtl="false"
android:progress="0"
android:indeterminate="false"
android:progressDrawable="@drawable/fingerprint_progress_ring"
android:rotation="-90"/>
</RelativeLayout>
android:background="@drawable/fp_illustration"
android:minHeight="@dimen/fingerprint_progress_bar_min_size"
android:progress="0" />