Merge "Implement additional fingerprint flows in Settings."
This commit is contained in:
@@ -62,62 +62,59 @@
|
||||
|
||||
<!-- Right area -->
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dip"
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
<RelativeLayout
|
||||
android:id="@+id/fingerprint_view_selector"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dip"
|
||||
android:orientation="vertical"
|
||||
android:layout_weight="1"
|
||||
android:layout_gravity="center">
|
||||
android:layout_gravity="center"
|
||||
android:gravity="center">
|
||||
|
||||
<FrameLayout
|
||||
<!-- Only one of the following views will show for any given mode -->
|
||||
<RelativeLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@drawable/fingerprint_progress_ring_bg">
|
||||
android:layout_centerInParent="true">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/fingerprint_animator"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerInParent="true"
|
||||
android:src="@drawable/fingerprint_indicator" />
|
||||
|
||||
<!-- One of the following views will show for any given mode -->
|
||||
<ProgressBar
|
||||
android:id="@+id/fingerprint_progress_bar"
|
||||
style="?android:attr/progressBarStyleHorizontal"
|
||||
android:layout_width="200dip"
|
||||
android:layout_height="200dip"
|
||||
android:max="100"
|
||||
android:layout_centerInParent="true"
|
||||
style="?android:attr/progressBarStyleHorizontal"
|
||||
android:max="10000"
|
||||
android:progress="0"
|
||||
android:indeterminate="false"
|
||||
android:progressDrawable="@drawable/fingerprint_progress_ring" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/fingerprint_sensor_location"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:src="@drawable/fingerprint_sensor_location"
|
||||
android:visibility="gone"/>
|
||||
</RelativeLayout>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/fingerprint_animator"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center"
|
||||
android:src="@drawable/fingerprint_animation"
|
||||
android:visibility="visible" />
|
||||
<ImageView
|
||||
android:id="@+id/fingerprint_sensor_location"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerInParent="true"
|
||||
android:src="@drawable/fingerprint_sensor_location" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/fingerprint_in_app_indicator"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:src="@drawable/fingerprint_in_app_indicator"
|
||||
android:visibility="visible" />
|
||||
</FrameLayout>
|
||||
|
||||
</LinearLayout>
|
||||
<ImageView
|
||||
android:id="@+id/fingerprint_in_app_indicator"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerInParent="true"
|
||||
android:src="@drawable/fingerprint_in_app_indicator" />
|
||||
</RelativeLayout>
|
||||
|
||||
<!-- Button area -->
|
||||
<LinearLayout
|
||||
|
Reference in New Issue
Block a user