cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix expiry dialog, reorder layouts

Browse Source
This commit is contained in:
Dominik Schürmann
2015-03-03 22:44:32 +01:00
parent 188559bbcd
commit 7b0e067f63
5 changed files with 92 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml
View File

@@ -16,23 +16,49 @@
android:layout_height="wrap_content"
android:text="@string/btn_no_date" />
<!--
Use Spinner style DatePicker, not the full calendar view
Android < 5:
android:spinnersShown="true"
android:calendarViewShown="false"
Android >= 5:
<LinearLayout
android:id="@+id/edit_subkey_expiry_layout"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
style="@style/SectionHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/section_current_expiry" />
<TextView
android:id="@+id/edit_subkey_expiry_current_expiry"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:padding="8dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
style="@style/SectionHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/section_new_expiry" />
<!--
Use Spinner style DatePicker, not the full calendar view
Android < 5:
android:spinnersShown="true"
android:calendarViewShown="false"
Android >= 5:
android:datePickerMode="spinner"
-->
<!-- Hide calendarView in tablets because of the unix warparound bug. -->
<DatePicker
android:id="@+id/edit_subkey_expiry_date_picker"
android:layout_gravity="center_horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:ignore="UnusedAttribute"
android:datePickerMode="spinner"
-->
<!-- Hide calendarView in tablets because of the unix warparound bug. -->
<DatePicker
android:id="@+id/edit_subkey_expiry_date_picker"
android:layout_gravity="center_horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:ignore="UnusedAttribute"
android:datePickerMode="spinner"
android:spinnersShown="true"
android:calendarViewShown="false" />
android:spinnersShown="true"
android:calendarViewShown="false" />
</LinearLayout>
</LinearLayout>

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

@@ -67,6 +67,8 @@
<string name="section_certs">"Certificates"</string>
<string name="section_encrypt">"Encrypt"</string>
<string name="section_decrypt">"Decrypt"</string>
<string name="section_current_expiry">"Current expiry"</string>
<string name="section_new_expiry">"New expiry"</string>
<!-- button -->
<string name="btn_decrypt_verify_file">"Decrypt, verify, and save file"</string>
@@ -226,7 +228,6 @@
<string name="no_file_selected">"Select a file first."</string>
<string name="encrypt_sign_successful">"Successfully signed and/or encrypted."</string>
<string name="encrypt_sign_clipboard_successful">"Successfully signed and/or encrypted to clipboard."</string>
<string name="enter_passphrase_twice">"Enter the passphrase twice."</string>
<string name="select_encryption_key">"Select at least one encryption key."</string>
<string name="select_encryption_or_signature_key">"Select at least one encryption key or a signature key."</string>
<string name="specify_file_to_encrypt_to">"Please specify which file to encrypt to.\nWARNING: File will be overwritten if it exists."</string>
@@ -1027,7 +1028,7 @@
<string name="msg_vl_clear_meta_file">"Filename: %s"</string>
<string name="msg_vl_clear_meta_mime">"MIME type: %s"</string>
<string name="msg_vl_clear_meta_time">"Modification time: %s"</string>
<string name="msg_vl_clear_meta_size">"Filesize: %s"</string>
<string name="msg_vl_clear_meta_size">"File size: %s"</string>
<string name="msg_vl_clear_signature_check">"Verifying signature data"</string>
<string name="msg_vl_error_integrity_check">"Integrity check error!"</string>
<string name="msg_vl_ok">"OK"</string>