Merge "Hide next button when max fingerprints enrolled"

2016-12-15 22:57:26 +00:00
parent 08951ab12f 016e4c6dad
commit a8dee23ee5
4 changed files with 149 additions and 1 deletions
--- a/res/layout/fingerprint_enroll_introduction.xml
+++ b/res/layout/fingerprint_enroll_introduction.xml
@@ -35,6 +35,12 @@
            android:layout_height="wrap_content"
            android:text="@string/security_settings_fingerprint_enroll_introduction_message" />

+        <com.android.setupwizardlib.view.RichTextView
+            android:id="@+id/error_text"
+            style="@style/SuwDescription.Glif"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"