aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
diff options
context:
space:
mode:
Diffstat (limited to 'OpenKeychain')
-rw-r--r--OpenKeychain/src/main/res/layout/add_subkey_dialog.xml83
-rw-r--r--OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml13
2 files changed, 59 insertions, 37 deletions
diff --git a/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml b/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml
index d32b1496f..4b5058a81 100644
--- a/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -90,42 +91,6 @@
android:layout_height="wrap_content"
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>
<TextView
@@ -190,6 +155,52 @@
android:text="@string/flag_authenticate" />
</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>
</ScrollView> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml b/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml
index a692db574..0931eb6a7 100644
--- a/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:paddingTop="16dp"
android:paddingBottom="16dp"
@@ -15,13 +16,23 @@
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:
+ 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" />
- <!-- Hide calendarView in tablets because of the unix warparound bug. -->
</LinearLayout> \ No newline at end of file