Merge remote-tracking branch 'upstream/development' into development

14 files changed, 68 insertions, 54 deletions

diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index d74a71fff..a1a6ed02e 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -67,10 +67,8 @@
     <uses-permission android:name="android.permission.READ_PROFILE" />
 
     <!-- android:allowBackup="false": Don't allow backup over adb backup or other apps! -->
-    <!-- tools:replace="android:allowBackup" is a workaround for https://github.com/geftimov/android-patternview/pull/2 -->
     <application
         android:name=".KeychainApplication"
-        tools:replace="android:allowBackup"
         android:allowBackup="false"
         android:hardwareAccelerated="true"
         android:icon="@drawable/ic_launcher"
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java
index 01218a4e4..970855c77 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java
@@ -24,7 +24,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.CheckBox;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -73,10 +72,8 @@ public class UserIdsAddedAdapter extends ArrayAdapter<String> {
             holder.vDelete.setVisibility(View.VISIBLE); // always visible
 
             // not used:
-            CheckBox checkBox = (CheckBox) convertView.findViewById(R.id.user_id_item_check_box);
             View certifiedLayout = convertView.findViewById(R.id.user_id_item_certified_layout);
             ImageView editImage = (ImageView) convertView.findViewById(R.id.user_id_item_edit_image);
-            checkBox.setVisibility(View.GONE);
             certifiedLayout.setVisibility(View.GONE);
             editImage.setVisibility(View.GONE);
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/EditSubkeyExpiryDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/EditSubkeyExpiryDialogFragment.java
index f46e253c0..fc618c9eb 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/EditSubkeyExpiryDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/EditSubkeyExpiryDialogFragment.java
@@ -151,9 +151,7 @@ public class EditSubkeyExpiryDialogFragment extends DialogFragment {
             );
         }
 
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) {
-            datePicker.setMinDate(creationCal.getTime().getTime());
-        }
+        datePicker.setMinDate(creationCal.getTime().getTime());
 
         alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
             @Override
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/create_key_activity.xml b/OpenKeychain/src/main/res/layout/create_key_activity.xml
index b9d5206a1..ecf69e640 100644
--- a/OpenKeychain/src/main/res/layout/create_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_activity.xml
@@ -14,7 +14,7 @@
     <FrameLayout
         android:layout_below="@id/toolbar_include"
         android:fitsSystemWindows="true"
-        android:layout_marginTop="-25dp"
+        android:layout_marginTop="@dimen/minus_statusbar_height"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
diff --git a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
index 06c1dda7b..3cf4a9e7b 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
@@ -14,7 +14,7 @@
     <LinearLayout
         android:layout_below="@id/toolbar_include"
         android:fitsSystemWindows="true"
-        android:layout_marginTop="-25dp"
+        android:layout_marginTop="@dimen/minus_statusbar_height"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
index a692b3681..da4aa7099 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
@@ -14,7 +14,7 @@
     <LinearLayout
         android:layout_below="@id/toolbar_include"
         android:fitsSystemWindows="true"
-        android:layout_marginTop="-25dp"
+        android:layout_marginTop="@dimen/minus_statusbar_height"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
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
diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
index 168e6d0be..f9efd81b4 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
@@ -15,7 +15,7 @@
         android:layout_below="@id/toolbar_include"
         android:id="@+id/content_frame"
         android:fitsSystemWindows="true"
-        android:layout_marginTop="-25dp"
+        android:layout_marginTop="@dimen/minus_statusbar_height"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
index fd7fd6672..67f17fa81 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
@@ -15,7 +15,7 @@
         android:layout_below="@id/toolbar_include"
         android:id="@+id/content_frame"
         android:fitsSystemWindows="true"
-        android:layout_marginTop="-25dp"
+        android:layout_marginTop="@dimen/minus_statusbar_height"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
index dcdd9a31a..fcc84f50f 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
@@ -14,7 +14,7 @@
     <LinearLayout
         android:layout_below="@id/toolbar_include"
         android:fitsSystemWindows="true"
-        android:layout_marginTop="-25dp"
+        android:layout_marginTop="@dimen/minus_statusbar_height"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/values-large/dimens.xml b/OpenKeychain/src/main/res/values-large/dimens.xml
deleted file mode 100644
index 045e125f3..000000000
--- a/OpenKeychain/src/main/res/values-large/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-</resources>
diff --git a/OpenKeychain/src/main/res/values-v21/dimens.xml b/OpenKeychain/src/main/res/values-v21/dimens.xml
index 7e07ae0f9..f06cbbb80 100644
--- a/OpenKeychain/src/main/res/values-v21/dimens.xml
+++ b/OpenKeychain/src/main/res/values-v21/dimens.xml
@@ -8,4 +8,5 @@
     <!-- 120dp + statusbar_height -->
     <dimen name="big_toolbar">141dp</dimen>
     <dimen name="huge_toolbar">243dp</dimen>
+    <dimen name="minus_statusbar_height">-25dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/dimens.xml b/OpenKeychain/src/main/res/values/dimens.xml
index 434a0a171..2aae06e2e 100644
--- a/OpenKeychain/src/main/res/values/dimens.xml
+++ b/OpenKeychain/src/main/res/values/dimens.xml
@@ -4,4 +4,5 @@
     <dimen name="statusbar_height">0dp</dimen>
     <dimen name="big_toolbar">120dp</dimen>
     <dimen name="huge_toolbar">222dp</dimen>
+    <dimen name="minus_statusbar_height">0dp</dimen>
 </resources>
\ No newline at end of file