diff options
| author | Daniel Hammann <github@honnel.de> | 2014-03-20 22:41:12 +0100 |
|---|---|---|
| committer | Daniel Hammann <github@honnel.de> | 2014-03-20 22:49:59 +0100 |
| commit | e00eeab1bfcda87e82c5ca51468cb4a5d12ae397 (patch) | |
| tree | 2dfa1827e27061135f44d6e8286cdce0361f31d9 /OpenPGP-Keychain/src/main | |
| parent | 58b22d1213a8b47e5a28b012431cbfa89f08cef8 (diff) | |
| download | open-keychain-e00eeab1bfcda87e82c5ca51468cb4a5d12ae397.tar.gz open-keychain-e00eeab1bfcda87e82c5ca51468cb4a5d12ae397.tar.bz2 open-keychain-e00eeab1bfcda87e82c5ca51468cb4a5d12ae397.zip | |
UI-Icon-Modifying #429 added hint to text edit, different icons for share and clipboard button
Diffstat (limited to 'OpenPGP-Keychain/src/main')
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml | 7 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/values/strings.xml | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml index d6a05f0d4..bb947fb5a 100644 --- a/OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml +++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml @@ -215,7 +215,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="top" - android:inputType="text|textCapSentences|textMultiLine|textLongMessage"/> + android:inputType="text|textCapSentences|textMultiLine|textLongMessage" + android:hint="@string/encrypt_content_edit_text_hint"/> </LinearLayout> <LinearLayout @@ -371,7 +372,7 @@ android:padding="4dp" android:layout_weight="1" android:text="@string/btn_share" - bootstrapbutton:bb_icon_left="fa-lock" + bootstrapbutton:bb_icon_left="fa-share-square" bootstrapbutton:bb_type="info"/> <com.beardedhen.androidbootstrap.BootstrapButton @@ -381,7 +382,7 @@ android:padding="4dp" android:layout_weight="1" android:text="@string/btn_clipboard" - bootstrapbutton:bb_icon_left="fa-lock" + bootstrapbutton:bb_icon_left="fa-clipboard" bootstrapbutton:bb_type="info"/> <com.beardedhen.androidbootstrap.BootstrapButton diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml index 9b4ab0747..3383174cb 100644 --- a/OpenPGP-Keychain/src/main/res/values/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values/strings.xml @@ -471,4 +471,7 @@ <string name="section_uids_to_sign">User IDs to sign</string> <string name="progress_re_adding_certs">Reapplying certificates</string> + <!-- hints --> + <string name="encrypt_content_edit_text_hint">Write message here to encrypt…</string> + </resources> |