summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorPaul Lawrence <paullawrence@google.com>2015-09-18 15:26:01 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-09-18 15:26:01 +0000
commit43be4b9b787ee4881dd27c41d1d554c8ef1d6a3d (patch)
tree51ad0f41143d263f3b05683a04b68fc993e249da /res
parentc2e73bbc06739cdd55f7baaca8ab1aa915ee6e83 (diff)
parent44985b9ccd31cbdd526047d36c82608061776b04 (diff)
downloadpackages_apps_Settings-43be4b9b787ee4881dd27c41d1d554c8ef1d6a3d.zip
packages_apps_Settings-43be4b9b787ee4881dd27c41d1d554c8ef1d6a3d.tar.gz
packages_apps_Settings-43be4b9b787ee4881dd27c41d1d554c8ef1d6a3d.tar.bz2
Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
Diffstat (limited to 'res')
-rw-r--r--res/layout/crypt_keeper_password_field.xml1
-rw-r--r--res/layout/crypt_keeper_pin_field.xml1
2 files changed, 2 insertions, 0 deletions
diff --git a/res/layout/crypt_keeper_password_field.xml b/res/layout/crypt_keeper_password_field.xml
index 34c7f64..8102658 100644
--- a/res/layout/crypt_keeper_password_field.xml
+++ b/res/layout/crypt_keeper_password_field.xml
@@ -28,6 +28,7 @@
android:inputType="textPassword"
android:textSize="16sp"
android:padding="10sp"
+ android:maxLength="500"
style="@style/TextAppearance.CryptKeeper_PasswordEntry" />
<include layout="@layout/crypt_keeper_switch_input_method" />
diff --git a/res/layout/crypt_keeper_pin_field.xml b/res/layout/crypt_keeper_pin_field.xml
index 56b4978..a13142e 100644
--- a/res/layout/crypt_keeper_pin_field.xml
+++ b/res/layout/crypt_keeper_pin_field.xml
@@ -28,6 +28,7 @@
android:inputType="numberPassword"
android:textSize="28sp"
android:padding="4sp"
+ android:maxLength="500"
style="@style/TextAppearance.CryptKeeper_PasswordEntry" />
<include layout="@layout/crypt_keeper_switch_input_method" />