am 824bcec9: am 0d1f08cb: am e2d4c5e8: am 09840984: am 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev

* commit '824bcec98d86a406bb90ca031e359d392f9f6ba9':
  [Fingerprint] Advertise wake & unlock during SUW
This commit is contained in:
Maurice Lam
2015-07-31 01:15:16 +00:00
committed by Android Git Automerger
4 changed files with 33 additions and 0 deletions

View File

@@ -31,12 +31,23 @@
android:clipChildren="false">
<TextView
android:id="@+id/message"
style="@style/TextAppearance.FingerprintMessage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_margin_top"
android:text="@string/security_settings_fingerprint_enroll_finish_message"/>
<TextView
android:id="@+id/message_secondary"
style="@style/TextAppearance.FingerprintMessage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_margin_top"
android:text="@string/setup_fingerprint_enroll_finish_message_secondary"
android:textColor="?android:attr/textColorSecondary"
android:visibility="gone" />
<View
android:layout_height="0dp"
android:layout_width="match_parent"