diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-21 09:59:14 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-21 09:59:14 +0100 |
| commit | a7ea9d4ecacfd6a9cca2338adc8ba08f0aa7bbf3 (patch) | |
| tree | 6367b5d4b1bd701105eb3d04784327a0d0879f99 | |
| parent | 81624aa648f72c55e87321768a16c0c843e64d3a (diff) | |
| parent | e00eeab1bfcda87e82c5ca51468cb4a5d12ae397 (diff) | |
| download | open-keychain-a7ea9d4ecacfd6a9cca2338adc8ba08f0aa7bbf3.tar.gz open-keychain-a7ea9d4ecacfd6a9cca2338adc8ba08f0aa7bbf3.tar.bz2 open-keychain-a7ea9d4ecacfd6a9cca2338adc8ba08f0aa7bbf3.zip | |
Merge pull request #461 from honnel/ui-tasks
UI-Icon-Modifying #429
| -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> |