Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev

This commit is contained in:
Paul Lawrence
2014-07-24 21:45:01 +00:00
committed by Android (Google) Code Review
3 changed files with 20 additions and 2 deletions

View File

@@ -25,6 +25,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal">
<!-- We need android:gravity="center_horizontal" to make multi line
status strings look good -->
<TextView
android:id="@+id/status"
android:layout_width="wrap_content"
@@ -35,7 +37,8 @@
android:textSize="18sp"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/enter_password"
android:layout_gravity="center_horizontal" />
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal" />
<TextView
android:id="@+id/owner_info"