Merge "There is no NEXT button in find sensor screen of fingerprint."
This commit is contained in:
@@ -40,45 +40,53 @@
|
|||||||
android:clipToPadding="false"
|
android:clipToPadding="false"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<LinearLayout
|
<ScrollView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="match_parent"
|
||||||
android:orientation="vertical"
|
|
||||||
android:clipChildren="false"
|
android:clipChildren="false"
|
||||||
android:clipToPadding="false">
|
android:clipToPadding="false">
|
||||||
|
|
||||||
<ImageView
|
<LinearLayout
|
||||||
android:id="@+id/suw_layout_icon"
|
|
||||||
style="@style/SuwGlifIcon"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="0dp"
|
|
||||||
android:layout_marginEnd="0dp"
|
|
||||||
android:src="@drawable/ic_fingerprint_header" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/suw_layout_title"
|
|
||||||
style="@style/SuwGlifHeaderTitle"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="0dp"
|
android:orientation="vertical"
|
||||||
android:layout_marginEnd="0dp" />
|
android:clipChildren="false"
|
||||||
|
android:clipToPadding="false">
|
||||||
|
|
||||||
<TextView
|
<ImageView
|
||||||
style="@style/SuwDescription.Glif"
|
android:id="@+id/suw_layout_icon"
|
||||||
android:layout_width="match_parent"
|
style="@style/SuwGlifIcon"
|
||||||
android:layout_height="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="0dp"
|
||||||
|
android:layout_marginEnd="0dp"
|
||||||
|
android:src="@drawable/ic_fingerprint_header" />
|
||||||
|
|
||||||
<Button
|
<TextView
|
||||||
style="@style/SetupWizardButton.Positive"
|
android:id="@+id/suw_layout_title"
|
||||||
android:id="@+id/next_button"
|
style="@style/SuwGlifHeaderTitle"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="8dp"
|
android:layout_marginStart="0dp"
|
||||||
android:text="@string/fingerprint_enroll_button_next" />
|
android:layout_marginEnd="0dp" />
|
||||||
|
|
||||||
</LinearLayout>
|
<TextView
|
||||||
|
style="@style/SuwDescription.Glif"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
style="@style/SetupWizardButton.Positive"
|
||||||
|
android:id="@+id/next_button"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="8dp"
|
||||||
|
android:text="@string/fingerprint_enroll_button_next" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</ScrollView>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user