diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-26 02:12:29 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-26 02:12:29 +0100 |
| commit | 84a57411a502795b3f58ac289fd735e99f6b86b9 (patch) | |
| tree | f8814aeed0ff76bdf9f0bed92e962e991767de9e /OpenKeychain | |
| parent | 4631f45ed760fbc7706852bb5dcf26b969da86b8 (diff) | |
| download | open-keychain-84a57411a502795b3f58ac289fd735e99f6b86b9.tar.gz open-keychain-84a57411a502795b3f58ac289fd735e99f6b86b9.tar.bz2 open-keychain-84a57411a502795b3f58ac289fd735e99f6b86b9.zip | |
add descriptive text to safeslinger activity
Diffstat (limited to 'OpenKeychain')
3 files changed, 36 insertions, 16 deletions
diff --git a/OpenKeychain/src/main/res/layout-v11/safe_slinger_activity.xml b/OpenKeychain/src/main/res/layout-v11/safe_slinger_activity.xml index 5e8e5aa5f..7e4410f85 100644 --- a/OpenKeychain/src/main/res/layout-v11/safe_slinger_activity.xml +++ b/OpenKeychain/src/main/res/layout-v11/safe_slinger_activity.xml @@ -9,17 +9,27 @@ android:paddingLeft="16dp" android:paddingRight="16dp"> - <TextView + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:layout_marginTop="14dp" - android:text="bla" /> + android:orientation="horizontal"> - <NumberPicker - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/safe_slinger_picker" /> + <TextView + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_marginBottom="4dp" + android:layout_marginTop="14dp" + android:text="@string/exchange_description" + android:layout_weight="1" + android:gravity="center_vertical"/> + + <NumberPicker + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/safe_slinger_picker" + /> + + </LinearLayout> <View android:layout_width="match_parent" diff --git a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml index e81c21182..39f4b7238 100644 --- a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml +++ b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml @@ -9,17 +9,26 @@ android:paddingLeft="16dp" android:paddingRight="16dp"> - <TextView + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:layout_marginTop="14dp" - android:text="bla" /> + android:orientation="horizontal"> - <Spinner - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/safe_slinger_spinner" /> + <TextView + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:layout_marginTop="14dp" + android:text="@string/exchange_description" + android:layout_weight="1"/> + + <Spinner + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/safe_slinger_spinner" + android:gravity="center_vertical"/> + + </LinearLayout> <View android:layout_width="match_parent" diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 48e26ae7f..b0d5fbc64 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1043,6 +1043,7 @@ <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="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> <!-- First Time --> <string name="first_time_text1">"Take back your privacy with OpenKeychain!"</string> |