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

Use spinner DatePicker, not full calendar, also on Android 5

Browse Source
This commit is contained in:
Dominik Schürmann 2015-03-03 19:04:40 +01:00
parent 5da57f0582
commit be06c4cd58
2 changed files with 59 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
OpenKeychain/src/main/res/layout/add_subkey_dialog.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
@ -90,42 +91,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" /> android:layout_gravity="center_vertical" />
<TableRow
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp">
<TextView
android:id="@+id/label_expiry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="10dip"
android:text="@string/label_expiry" />
<CheckBox
android:id="@+id/add_subkey_no_expiry"
android:checked="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/btn_no_date" />
</TableRow>
<TableRow
android:id="@+id/add_subkey_expiry_row"
android:visibility="gone">
<DatePicker
android:id="@+id/add_subkey_expiry_date_picker"
android:layout_span="2"
android:layout_gravity="center_horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:spinnersShown="true"
android:calendarViewShown="false" />
</TableRow>
<TableRow> <TableRow>
<TextView <TextView
@ -190,6 +155,52 @@
android:text="@string/flag_authenticate" /> android:text="@string/flag_authenticate" />
</TableRow> </TableRow>
<TableRow
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp">
<TextView
android:id="@+id/label_expiry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="10dip"
android:text="@string/label_expiry" />
<CheckBox
android:id="@+id/add_subkey_no_expiry"
android:checked="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/btn_no_date" />
</TableRow>
<TableRow
android:id="@+id/add_subkey_expiry_row"
android:visibility="gone">
<!--
Use Spinner style DatePicker, not the full calendar view
Android < 5:
android:spinnersShown="true"
android:calendarViewShown="false"
Android >= 5:
android:datePickerMode="spinner"
-->
<DatePicker
android:id="@+id/add_subkey_expiry_date_picker"
android:layout_span="2"
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" />
</TableRow>
</TableLayout> </TableLayout>
</ScrollView> </ScrollView>

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

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="16dp" android:paddingTop="16dp"
android:paddingBottom="16dp" android:paddingBottom="16dp"
@ -15,13 +16,23 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/btn_no_date" /> 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:
android:datePickerMode="spinner"
-->
<!-- Hide calendarView in tablets because of the unix warparound bug. -->
<DatePicker <DatePicker
android:id="@+id/edit_subkey_expiry_date_picker" android:id="@+id/edit_subkey_expiry_date_picker"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:ignore="UnusedAttribute"
android:datePickerMode="spinner"
android:spinnersShown="true" android:spinnersShown="true"
android:calendarViewShown="false" /> android:calendarViewShown="false" />
<!-- Hide calendarView in tablets because of the unix warparound bug. -->
</LinearLayout> </LinearLayout>