diff options
| author | Jim Miller <jaggies@google.com> | 2012-06-15 17:56:49 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2012-06-15 17:56:49 -0700 |
| commit | feeafe2e794a21fa0963895c034ef16dc95e989f (patch) | |
| tree | 7e81a2eb749fd5e2c09a707280b8fb2fba138656 /res/layout-land | |
| parent | 5ea994c552ea72385022c0c81b8b69acbe30a113 (diff) | |
| download | packages_apps_Settings-feeafe2e794a21fa0963895c034ef16dc95e989f.zip packages_apps_Settings-feeafe2e794a21fa0963895c034ef16dc95e989f.tar.gz packages_apps_Settings-feeafe2e794a21fa0963895c034ef16dc95e989f.tar.bz2 | |
Fix 6663465: remove flagNoEnterAction in favor of actionNext
This fixes a bug where the return key was showing in some layouts
for choose/confirm password screens in Settings. Now we just use
"actionNext" which ensures we see consistent behavior across
devices.
Change-Id: I4bf3033654b85f14c55de6f418caaf1ce563c33a
Diffstat (limited to 'res/layout-land')
| -rw-r--r-- | res/layout-land/choose_lock_password.xml | 2 | ||||
| -rw-r--r-- | res/layout-land/confirm_lock_password.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/res/layout-land/choose_lock_password.xml b/res/layout-land/choose_lock_password.xml index 005dd63..ade6f25 100644 --- a/res/layout-land/choose_lock_password.xml +++ b/res/layout-land/choose_lock_password.xml @@ -50,6 +50,7 @@ android:singleLine="true" android:textStyle="bold" android:inputType="textPassword" + android:imeOptions="actionNext" android:gravity="center" android:layout_gravity="center" android:textSize="24sp" @@ -58,7 +59,6 @@ android:textAppearance="?android:attr/textAppearanceLarge" android:background="@drawable/password_field_default" android:textColor="#ffffffff" - android:imeOptions="actionNext|flagNoEnterAction" /> </LinearLayout> diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml index e5580eb..a9b5640 100644 --- a/res/layout-land/confirm_lock_password.xml +++ b/res/layout-land/confirm_lock_password.xml @@ -51,6 +51,7 @@ android:singleLine="true" android:textStyle="bold" android:inputType="textPassword" + android:imeOptions="actionNext" android:gravity="center" android:layout_gravity="center" android:textSize="24sp" @@ -59,7 +60,6 @@ android:textAppearance="?android:attr/textAppearanceLarge" android:background="@drawable/password_field_default" android:textColor="#ffffffff" - android:imeOptions="actionNext|flagNoEnterAction" /> </LinearLayout> |