certs: more filters, better initial uid selection, code cosmetics

    - add three types of filters for certificate list (ui looks like crap
      there, need to work on that)
    - select uncertified uids by default in CertifyKeyActivity
    - move some code around in KeychainProvider, 's slightly less hacky now

1 files changed, 14 insertions, 17 deletions

diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml
index 60f071bd4..b2bfe1700 100644
--- a/OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml
@@ -9,29 +9,26 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
+        <Spinner
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/spinner"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center_horizontal"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="2dp"
+            android:layout_marginBottom="2dp" />
+
         <view
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             class="se.emilsjolander.stickylistheaders.StickyListHeadersListView"
             android:id="@+id/list"
-            android:layout_alignParentTop="true"
-            android:layout_above="@+id/showUnknown"
             android:paddingRight="32dp"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:paddingLeft="16dp" />
-
-        <CheckBox
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/show_unknown_signatures"
-            android:id="@+id/showUnknown"
-            android:enabled="true"
-            android:layout_alignParentBottom="true"
-            android:layout_alignEnd="@+id/list"
-            android:singleLine="false"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="16dp" />
+            android:paddingLeft="16dp"
+            android:layout_alignParentStart="false"
+            android:layout_alignParentEnd="false"
+            android:layout_below="@+id/spinner" />
 
         <TextView
             android:layout_width="wrap_content"