diff options
| author | Jim Miller <jaggies@google.com> | 2012-06-18 13:19:42 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-18 13:19:42 -0700 |
| commit | 284c9872cea3a5d97e1b1dd0016ac376da695175 (patch) | |
| tree | 3acf8b9465baa7c3bb547b51b5905de329ec5b86 /res/layout | |
| parent | 4d8dac0792ec7994f9f4cbf2648cf8f3185876ca (diff) | |
| parent | feeafe2e794a21fa0963895c034ef16dc95e989f (diff) | |
| download | packages_apps_settings-284c9872cea3a5d97e1b1dd0016ac376da695175.zip packages_apps_settings-284c9872cea3a5d97e1b1dd0016ac376da695175.tar.gz packages_apps_settings-284c9872cea3a5d97e1b1dd0016ac376da695175.tar.bz2 | |
Merge "Fix 6663465: remove flagNoEnterAction in favor of actionNext" into jb-dev
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/choose_lock_password.xml | 2 | ||||
| -rw-r--r-- | res/layout/confirm_lock_password.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml index cb817c5..e979413 100644 --- a/res/layout/choose_lock_password.xml +++ b/res/layout/choose_lock_password.xml @@ -45,6 +45,7 @@ android:singleLine="true" android:textStyle="bold" android:inputType="textPassword" + android:imeOptions="actionNext" android:gravity="center" android:layout_gravity="center" android:textSize="24sp" @@ -53,7 +54,6 @@ android:textAppearance="?android:attr/textAppearanceLarge" android:background="@drawable/password_field_default" android:textColor="#ffffffff" - android:imeOptions="actionNext|flagNoEnterAction" /> <!-- Spacer between password entry and keyboard --> diff --git a/res/layout/confirm_lock_password.xml b/res/layout/confirm_lock_password.xml index 21eecc2..c952139 100644 --- a/res/layout/confirm_lock_password.xml +++ b/res/layout/confirm_lock_password.xml @@ -49,6 +49,7 @@ android:singleLine="true" android:textStyle="bold" android:inputType="textPassword" + android:imeOptions="actionNext" android:gravity="center" android:layout_gravity="center" android:textSize="24sp" @@ -57,7 +58,6 @@ android:textAppearance="?android:attr/textAppearanceLarge" android:background="@drawable/password_field_default" android:textColor="#ffffffff" - android:imeOptions="actionNext|flagNoEnterAction" /> <!-- Spacer between password entry and keyboard --> |