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 | |
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')
-rw-r--r-- | res/layout-land/choose_lock_password.xml | 2 | ||||
-rw-r--r-- | res/layout-land/confirm_lock_password.xml | 2 | ||||
-rw-r--r-- | res/layout-sw600dp-land/choose_lock_password.xml | 1 | ||||
-rw-r--r-- | res/layout-sw600dp-land/confirm_lock_password.xml | 1 | ||||
-rw-r--r-- | res/layout-sw600dp/choose_lock_password.xml | 1 | ||||
-rw-r--r-- | res/layout-sw600dp/confirm_lock_password.xml | 1 | ||||
-rw-r--r-- | res/layout/choose_lock_password.xml | 2 | ||||
-rw-r--r-- | res/layout/confirm_lock_password.xml | 2 |
8 files changed, 8 insertions, 4 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> diff --git a/res/layout-sw600dp-land/choose_lock_password.xml b/res/layout-sw600dp-land/choose_lock_password.xml index 9518672..3895529 100644 --- a/res/layout-sw600dp-land/choose_lock_password.xml +++ b/res/layout-sw600dp-land/choose_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" diff --git a/res/layout-sw600dp-land/confirm_lock_password.xml b/res/layout-sw600dp-land/confirm_lock_password.xml index 3874f11..c4472db 100644 --- a/res/layout-sw600dp-land/confirm_lock_password.xml +++ b/res/layout-sw600dp-land/confirm_lock_password.xml @@ -52,6 +52,7 @@ android:singleLine="true" android:textStyle="bold" android:inputType="textPassword" + android:imeOptions="actionNext" android:gravity="center" android:layout_gravity="center" android:textSize="24sp" diff --git a/res/layout-sw600dp/choose_lock_password.xml b/res/layout-sw600dp/choose_lock_password.xml index c8a0866..df53f68 100644 --- a/res/layout-sw600dp/choose_lock_password.xml +++ b/res/layout-sw600dp/choose_lock_password.xml @@ -46,6 +46,7 @@ android:singleLine="true" android:textStyle="bold" android:inputType="textPassword" + android:imeOptions="actionNext" android:gravity="center" android:layout_gravity="center" android:textSize="32sp" diff --git a/res/layout-sw600dp/confirm_lock_password.xml b/res/layout-sw600dp/confirm_lock_password.xml index 5ffc5e7..722153d 100644 --- a/res/layout-sw600dp/confirm_lock_password.xml +++ b/res/layout-sw600dp/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="32sp" 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 --> |