diff options
| author | Daniel Ramos <hiperzone@gmail.com> | 2015-04-24 03:44:57 +0100 |
|---|---|---|
| committer | Daniel Ramos <hiperzone@gmail.com> | 2015-04-24 03:44:57 +0100 |
| commit | 40122d61ccd13a06602cf614f18aedee82bf1ad0 (patch) | |
| tree | 629cc59b845990ff2aae84f446b40bcccec531ce /OpenKeychain/src/main/res | |
| parent | 702c28854bf0afe3d7b97e47716530dc751c9322 (diff) | |
| parent | 76841ca873e5ce81d170a21c8d3cc09ce24522ba (diff) | |
| download | open-keychain-40122d61ccd13a06602cf614f18aedee82bf1ad0.tar.gz open-keychain-40122d61ccd13a06602cf614f18aedee82bf1ad0.tar.bz2 open-keychain-40122d61ccd13a06602cf614f18aedee82bf1ad0.zip | |
Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into development
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/add_email_dialog.xml | 1 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/create_key_email_fragment.xml | 1 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/layout/add_email_dialog.xml b/OpenKeychain/src/main/res/layout/add_email_dialog.xml index 68d895145..2de657a40 100644 --- a/OpenKeychain/src/main/res/layout/add_email_dialog.xml +++ b/OpenKeychain/src/main/res/layout/add_email_dialog.xml @@ -21,6 +21,7 @@ android:layout_marginTop="16dp" android:hint="@string/label_email" android:imeOptions="actionNext" + android:inputType="textEmailAddress" android:textAppearance="?android:attr/textAppearanceMedium" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml index 17cfe54ac..7b9cffec4 100644 --- a/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml @@ -32,6 +32,7 @@ android:layout_marginTop="16dp" android:layout_marginBottom="8dp" android:imeOptions="actionNext" + android:inputType="textEmailAddress" android:hint="@string/label_email" android:ems="10" /> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index df88336a1..33fc362a1 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -639,6 +639,7 @@ <string name="create_key_add_email">"Add email address"</string> <string name="create_key_add_email_text">"Additional email addresses are also associated to this key and can be used for secure communication."</string> <string name="create_key_email_already_exists_text">"Email address has already been added"</string> + <string name="create_key_email_invalid_email">"Email address format is invalid"</string> <!-- View key --> <string name="view_key_revoked">"Revoked: Key must not be used anymore!"</string> |