PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hint user that fingerprint cannot unlock FBE keys" into nyc-dev am: 2f99770

Browse Source 
am: a62dd8b

* commit 'a62dd8b1d116ca0f17a33551480f8173e1ff9b31':
  Hint user that fingerprint cannot unlock FBE keys

Change-Id: I1fbf61bd752ace0b52b3de4e8f9f5945a6b3aa21
This commit is contained in:
Ricky Wai
2016-04-12 11:20:54 +00:00
committed by android-build-merger
parent 6322fa7e0c a62dd8b1d1
commit e4b811fe6a
7 changed files with 61 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/layout/confirm_lock_password_base.xml
View File

@@ -59,9 +59,15 @@
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"/>
<View android:layout_width="match_parent"
<TextView
android:id="@+id/strongAuthRequiredText"
style="@style/TextAppearance.ConfirmDeviceCredentialsStrongAuthRequiredText"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
android:layout_weight="1"
android:singleLine="true"
android:ellipsize="marquee"
android:gravity="center"/>
<EditText
android:id="@+id/password_entry"

10
res/layout/confirm_lock_pattern_base.xml
View File

@@ -59,9 +59,15 @@
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"/>
<View android:layout_width="match_parent"
<TextView
android:id="@+id/strongAuthRequiredText"
style="@style/TextAppearance.ConfirmDeviceCredentialsStrongAuthRequiredText"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="0.5"/>
android:layout_weight="0.5"
android:singleLine="true"
android:ellipsize="marquee"
android:gravity="center"/>
<com.android.internal.widget.LockPatternView
android:id="@+id/lockPattern"