moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-25 00:18:51 -05:00
Code Issues Releases Wiki Activity

add descriptive text to safeslinger activity

Browse Source
This commit is contained in:
Vincent Breitmoser 2014-10-26 02:12:29 +01:00
parent 4631f45ed7
commit 84a57411a5
3 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
OpenKeychain/src/main/res/layout-v11/safe_slinger_activity.xml
View File

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

25
OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
View File

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

1
OpenKeychain/src/main/res/values/strings.xml
View File

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