diff options
author | Manoj Khanna <manojkhannakm@gmail.com> | 2015-04-22 18:30:35 +0530 |
---|---|---|
committer | Manoj Khanna <manojkhannakm@gmail.com> | 2015-04-22 19:22:12 +0530 |
commit | aecebd2ac012804477ab3ec59ca6cf0417a56c5f (patch) | |
tree | f4d67da5222c952a890725ba3cd4b736abf72226 /OpenKeychain/src/main/res | |
parent | 43484c8236345838d5a33202a156cb5a5192cf5f (diff) | |
download | open-keychain-aecebd2ac012804477ab3ec59ca6cf0417a56c5f.tar.gz open-keychain-aecebd2ac012804477ab3ec59ca6cf0417a56c5f.tar.bz2 open-keychain-aecebd2ac012804477ab3ec59ca6cf0417a56c5f.zip |
Fixed Snackbar behind layout
Surrounded string with quotes
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml | 4 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml | 27 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 1 |
3 files changed, 16 insertions, 16 deletions
diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml index b75ec5022..8fd2c79fc 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> @@ -12,4 +12,4 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> -</LinearLayout>
\ No newline at end of file +</RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml index 3c21291cd..7645918f4 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml @@ -1,25 +1,24 @@ <?xml version="1.0" encoding="utf-8"?> -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent" - android:fillViewport="true"> + android:layout_height="match_parent"> - <LinearLayout + <ScrollView android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="4dp" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:orientation="vertical"> + android:layout_height="match_parent" + android:fillViewport="true"> <EditText android:id="@+id/encrypt_text_text" android:layout_width="match_parent" - android:layout_height="0dip" + android:layout_height="wrap_content" + android:layout_marginTop="4dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" android:gravity="top" android:inputType="text|textCapSentences|textMultiLine|textLongMessage" - android:hint="@string/encrypt_content_edit_text_hint" - android:layout_weight="1" /> + android:hint="@string/encrypt_content_edit_text_hint" /> - </LinearLayout> -</ScrollView> + </ScrollView> + +</RelativeLayout> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index fa8bd16b9..df88336a1 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1238,6 +1238,7 @@ <string name="swipe_to_update">"Swipe down to update from keyserver"</string> <string name="error_no_file_selected">"Select at least one file to encrypt!"</string> <string name="error_multi_not_supported">"Saving of multiple files not supported. This is a limitation on current Android."</string> + <string name="error_empty_text">"Type some text to encrypt!"</string> <string name="key_colon">"Key:"</string> <string name="exchange_description">"To start a key exchange, choose the number of participants on the right side, then hit the “Start exchange” button.\n\nYou will be asked two more questions to make sure only the right participants are in the exchange and their fingerprints are correct."</string> <string name="btn_start_exchange">"Start exchange"</string> |