Merge pull request #461 from honnel/ui-tasks

UI-Icon-Modifying #429
This commit is contained in:
Dominik Schürmann 2014-03-21 09:59:14 +01:00
commit a7ea9d4eca
2 changed files with 7 additions and 3 deletions

View File

@ -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

View File

@ -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>