diff options
| author | Tony Mantler <nicoya@google.com> | 2014-04-07 16:30:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-07 16:30:50 +0000 |
| commit | b09dd77d95411807354cbc42d0ad9258cf75f699 (patch) | |
| tree | c53e1f0c1354fb7520b32cd17a5aa48198680236 /res | |
| parent | 4c0c00f3e4652a4a94404eadfdc28bf1fe47cef3 (diff) | |
| parent | 6cbdd5bba0c9c68a3261e54b1cebff48459657d5 (diff) | |
| download | android_packages_apps_Email-b09dd77d95411807354cbc42d0ad9258cf75f699.tar.gz android_packages_apps_Email-b09dd77d95411807354cbc42d0ad9258cf75f699.tar.bz2 android_packages_apps_Email-b09dd77d95411807354cbc42d0ad9258cf75f699.zip | |
am 6cbdd5bb: Fix more IME actions
* commit '6cbdd5bba0c9c68a3261e54b1cebff48459657d5':
Fix more IME actions
Diffstat (limited to 'res')
4 files changed, 11 insertions, 25 deletions
diff --git a/res/layout-w600dp/account_setup_incoming_fragment.xml b/res/layout-w600dp/account_setup_incoming_fragment.xml index 83673a7e4..a739c077e 100644 --- a/res/layout-w600dp/account_setup_incoming_fragment.xml +++ b/res/layout-w600dp/account_setup_incoming_fragment.xml @@ -35,8 +35,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/account_setup_incoming_username_label" - android:inputType="textEmailAddress" - android:imeOptions="actionDone" /> + android:inputType="textEmailAddress" /> </TableRow> <TableRow android:paddingTop="16dip" > @@ -95,8 +94,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/account_setup_incoming_server_label" - android:inputType="textUri" - android:imeOptions="actionDone" /> + android:inputType="textUri" /> </TableRow> <TableRow android:paddingTop="16dip" > @@ -125,8 +123,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/account_setup_incoming_port_label" - android:inputType="number" - android:imeOptions="actionDone" /> + android:inputType="number" /> </TableRow> <TableRow @@ -159,8 +156,7 @@ android:layout_height="wrap_content" android:contentDescription="@string/account_setup_incoming_imap_path_prefix_label" android:hint="@string/account_setup_incoming_imap_path_prefix_hint" - android:inputType="text" - android:imeOptions="actionDone" /> + android:inputType="text" /> </TableRow> </TableLayout> diff --git a/res/layout-w600dp/account_setup_outgoing_fragment.xml b/res/layout-w600dp/account_setup_outgoing_fragment.xml index 5a2365be0..cbcba16e0 100644 --- a/res/layout-w600dp/account_setup_outgoing_fragment.xml +++ b/res/layout-w600dp/account_setup_outgoing_fragment.xml @@ -35,8 +35,7 @@ android:id="@+id/account_server" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:inputType="textUri" - android:imeOptions="actionDone" /> + android:inputType="textUri" /> </TableRow> <TableRow android:paddingTop="16dip" > @@ -63,8 +62,7 @@ android:id="@+id/account_port" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:inputType="number" - android:imeOptions="actionDone" /> + android:inputType="number" /> </TableRow> <!-- Note, this row is not a TableRow, and it will span the entire table - no columns --> <LinearLayout @@ -103,8 +101,7 @@ android:id="@+id/account_username" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:inputType="textEmailAddress" - android:imeOptions="actionDone" /> + android:inputType="textEmailAddress" /> </TableRow> <TableRow android:id="@+id/account_require_login_settings_2" diff --git a/res/layout/account_setup_incoming_fragment.xml b/res/layout/account_setup_incoming_fragment.xml index 8fce597f5..e7fffe38d 100644 --- a/res/layout/account_setup_incoming_fragment.xml +++ b/res/layout/account_setup_incoming_fragment.xml @@ -31,8 +31,7 @@ android:layout_height="wrap_content" android:layout_width="match_parent" android:hint="@string/account_setup_incoming_username_label" - android:inputType="textEmailAddress" - android:imeOptions="actionNext" /> + android:inputType="textEmailAddress" /> <com.android.email.activity.setup.AuthenticationView android:id="@+id/authentication_view" @@ -80,8 +79,7 @@ android:layout_height="wrap_content" android:layout_width="match_parent" android:hint="@string/account_setup_incoming_server_label" - android:inputType="textUri" - android:imeOptions="actionNext" /> + android:inputType="textUri" /> <TextView android:text="@string/account_setup_incoming_port_label" android:layout_height="wrap_content" @@ -92,8 +90,7 @@ android:layout_height="wrap_content" android:layout_width="match_parent" android:hint="@string/account_setup_incoming_port_label" - android:inputType="number" - android:imeOptions="actionDone" /> + android:inputType="number" /> <TextView android:text="@string/account_setup_incoming_security_label" android:layout_height="wrap_content" @@ -131,7 +128,6 @@ android:layout_height="wrap_content" android:layout_width="match_parent" android:hint="@string/account_setup_incoming_imap_path_prefix_hint" - android:inputType="text" - android:imeOptions="actionDone" /> + android:inputType="text" /> </LinearLayout> </LinearLayout> diff --git a/res/layout/account_setup_outgoing_fragment.xml b/res/layout/account_setup_outgoing_fragment.xml index f0183e8e4..086341182 100644 --- a/res/layout/account_setup_outgoing_fragment.xml +++ b/res/layout/account_setup_outgoing_fragment.xml @@ -29,7 +29,6 @@ <EditText android:id="@+id/account_server" android:inputType="textUri" - android:imeOptions="actionDone" android:layout_height="wrap_content" android:layout_width="match_parent" /> <TextView @@ -40,7 +39,6 @@ <EditText android:id="@+id/account_port" android:inputType="number" - android:imeOptions="actionDone" android:layout_height="wrap_content" android:layout_width="match_parent" /> <TextView @@ -71,7 +69,6 @@ <EditText android:id="@+id/account_username" android:inputType="textEmailAddress" - android:imeOptions="actionDone" android:layout_height="wrap_content" android:layout_width="match_parent" /> <com.android.email.activity.setup.AuthenticationView |