summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Mantler <nicoya@google.com>2014-04-04 23:18:25 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-04 23:18:25 +0000
commit4c0c00f3e4652a4a94404eadfdc28bf1fe47cef3 (patch)
tree25cf160f0de233bff45488f9ab5b99e6b4361f45
parentdf2fe89e8119a4348f7b3a1c72dc118a29876b10 (diff)
parentd1a48cb5f4cb300677ef62a3cf64a4324d9516aa (diff)
downloadandroid_packages_apps_Email-4c0c00f3e4652a4a94404eadfdc28bf1fe47cef3.tar.gz
android_packages_apps_Email-4c0c00f3e4652a4a94404eadfdc28bf1fe47cef3.tar.bz2
android_packages_apps_Email-4c0c00f3e4652a4a94404eadfdc28bf1fe47cef3.zip
am d1a48cb5: Merge "Fix IME actions for Names screen on setup flow" into ub-mail-algol
* commit 'd1a48cb5f4cb300677ef62a3cf64a4324d9516aa': Fix IME actions for Names screen on setup flow
-rw-r--r--res/layout/account_setup_names_fragment.xml6
1 files changed, 2 insertions, 4 deletions
diff --git a/res/layout/account_setup_names_fragment.xml b/res/layout/account_setup_names_fragment.xml
index 79008ce7b..b452f84a0 100644
--- a/res/layout/account_setup_names_fragment.xml
+++ b/res/layout/account_setup_names_fragment.xml
@@ -28,8 +28,7 @@
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:contentDescription="@string/account_setup_names_account_name_label"
- android:inputType="textCapWords|textNoSuggestions"
- android:imeOptions="actionNext" />
+ android:inputType="textCapWords|textNoSuggestions" />
<TextView
android:id="@+id/account_name_label"
android:layout_height="wrap_content"
@@ -41,6 +40,5 @@
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:contentDescription="@string/account_setup_names_user_name_label"
- android:inputType="textPersonName"
- android:imeOptions="actionDone" />
+ android:inputType="textPersonName" />
</LinearLayout> \ No newline at end of file