From be06c4cd5839d9860485fc96e152794c68484e71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 3 Mar 2015 19:04:40 +0100
Subject: Use spinner DatePicker, not full calendar, also on Android 5

---
 .../src/main/res/layout/add_subkey_dialog.xml      | 83 ++++++++++++----------
 .../main/res/layout/edit_subkey_expiry_dialog.xml  | 13 +++-
 2 files changed, 59 insertions(+), 37 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

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
-- 
cgit v1.2.3


From 5a4fc0a07127155f9c560374e65bf1373979d3ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 3 Mar 2015 20:15:09 +0100
Subject: Fix toolbar margins on Android lower 5

---
 OpenKeychain/src/main/res/layout/create_key_activity.xml    | 2 +-
 OpenKeychain/src/main/res/layout/decrypt_files_activity.xml | 2 +-
 OpenKeychain/src/main/res/layout/decrypt_text_activity.xml  | 2 +-
 OpenKeychain/src/main/res/layout/encrypt_files_activity.xml | 2 +-
 OpenKeychain/src/main/res/layout/encrypt_text_activity.xml  | 2 +-
 OpenKeychain/src/main/res/layout/import_keys_activity.xml   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

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/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">
-- 
cgit v1.2.3


From 6c0a5c04e758a3ee972e121dee5d3a0fc598ff6b Mon Sep 17 00:00:00 2001
From: jiangkai <jiangkai@gmail.com>
Date: Tue, 3 Mar 2015 11:26:59 -0800
Subject: change icon name in layout files

---
 .../src/main/res/layout/api_account_settings_fragment.xml      |  2 +-
 .../src/main/res/layout/api_accounts_adapter_list_item.xml     |  2 +-
 .../src/main/res/layout/api_apps_adapter_list_item.xml         |  2 +-
 OpenKeychain/src/main/res/layout/create_key_input_fragment.xml |  2 +-
 OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml     |  4 ++--
 OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml     |  4 ++--
 OpenKeychain/src/main/res/layout/edit_key_fragment.xml         |  4 ++--
 .../src/main/res/layout/encrypt_decrypt_overview_fragment.xml  |  8 ++++----
 OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml    |  4 ++--
 OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml     |  4 ++--
 OpenKeychain/src/main/res/layout/file_dialog.xml               |  2 +-
 OpenKeychain/src/main/res/layout/file_list_entry.xml           |  2 +-
 OpenKeychain/src/main/res/layout/file_list_entry_add.xml       |  2 +-
 OpenKeychain/src/main/res/layout/first_time_activity.xml       |  2 +-
 OpenKeychain/src/main/res/layout/import_keys_activity.xml      |  2 +-
 .../src/main/res/layout/import_keys_cloud_fragment.xml         |  4 ++--
 OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml |  4 ++--
 OpenKeychain/src/main/res/layout/log_display_item.xml          |  2 +-
 OpenKeychain/src/main/res/layout/upload_key_activity.xml       |  2 +-
 OpenKeychain/src/main/res/layout/view_cert_activity.xml        |  2 +-
 .../src/main/res/layout/view_key_adv_share_fragment.xml        | 10 +++++-----
 OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml  |  4 ++--
 OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml |  4 ++--
 23 files changed, 39 insertions(+), 39 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
index cd74255c7..784996c0d 100644
--- a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
@@ -21,7 +21,7 @@
             android:layout_alignParentBottom="true"
             android:layout_alignParentTop="true"
             android:layout_marginRight="6dp"
-            android:src="@drawable/ic_action_person" />
+            android:src="@drawable/ic_person_grey_24dp" />
 
         <TextView
             android:id="@+id/api_account_settings_acc_name"
diff --git a/OpenKeychain/src/main/res/layout/api_accounts_adapter_list_item.xml b/OpenKeychain/src/main/res/layout/api_accounts_adapter_list_item.xml
index d31ae52d7..39d87ee25 100644
--- a/OpenKeychain/src/main/res/layout/api_accounts_adapter_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/api_accounts_adapter_list_item.xml
@@ -14,7 +14,7 @@
         android:paddingTop="4dp"
         android:paddingBottom="4dp"
         android:id="@+id/imageView"
-        android:src="@drawable/ic_action_person" />
+        android:src="@drawable/ic_person_grey_24dp" />
 
     <TextView
         android:id="@+id/api_accounts_adapter_item_name"
diff --git a/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml b/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml
index c4ea46d43..9166f958e 100644
--- a/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml
@@ -17,7 +17,7 @@
         android:id="@+id/api_apps_adapter_install_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_action_download"
+        android:src="@drawable/ic_file_download_grey_24dp"
         android:layout_centerVertical="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
index f678825aa..d817f9269 100644
--- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
@@ -135,7 +135,7 @@
             android:layout_weight="1"
             android:text="@string/btn_next"
             android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableRight="@drawable/ic_action_play"
+            android:drawableRight="@drawable/ic_play_arrow_grey_24dp"
             android:drawablePadding="8dp"
             android:gravity="center_vertical"
             android:clickable="true"
diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
index 394ef10f4..a5646dc26 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
@@ -50,7 +50,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:hint="@string/filemanager_title_open"
-                    android:drawableRight="@drawable/ic_action_collection"
+                    android:drawableRight="@drawable/ic_folder_grey_24dp"
                     android:drawablePadding="8dp"
                     android:gravity="center_vertical" />
             </LinearLayout>
@@ -82,7 +82,7 @@
                     android:text="@string/btn_decrypt_verify_file"
                     android:clickable="true"
                     style="@style/SelectableItem"
-                    android:drawableRight="@drawable/ic_action_save"
+                    android:drawableRight="@drawable/ic_save_grey_24dp"
                     android:drawablePadding="8dp"
                     android:gravity="center_vertical"
                     android:layout_alignParentBottom="true"
diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
index cbe03056c..0f341b2d6 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
@@ -59,7 +59,7 @@
                 android:layout_height="wrap_content"
                 android:minHeight="?android:attr/listPreferredItemHeight"
                 android:text="@string/btn_add_share_decrypted_text"
-                android:drawableRight="@drawable/ic_action_share"
+                android:drawableRight="@drawable/ic_share_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
                 android:layout_weight="1" />
@@ -77,7 +77,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:padding="8dp"
-                android:src="@drawable/ic_action_copy"
+                android:src="@drawable/ic_content_copy_grey_24dp"
                 android:layout_gravity="center_vertical"
                 style="@style/SelectableItem" />
 
diff --git a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml
index 2ffbc66f4..9bd4e61c0 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml
@@ -26,7 +26,7 @@
             android:layout_height="match_parent"
             android:text="@string/edit_key_action_change_passphrase"
             android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableRight="@drawable/ic_action_edit"
+            android:drawableRight="@drawable/ic_mode_edit_grey_24dp"
             android:drawablePadding="8dp"
             android:gravity="center_vertical"
             android:clickable="true"
@@ -69,7 +69,7 @@
             android:layout_height="match_parent"
             android:text="@string/edit_key_action_add_identity"
             android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableRight="@drawable/ic_action_add_person"
+            android:drawableRight="@drawable/ic_person_add_grey_24dp"
             android:drawablePadding="8dp"
             android:gravity="center_vertical"
             android:clickable="true"
diff --git a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
index d62c9f32b..6f822148e 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
@@ -25,7 +25,7 @@
         android:clickable="true"
         style="@style/SelectableItem"
         android:text="@string/btn_encrypt_files"
-        android:drawableRight="@drawable/ic_action_collection"
+        android:drawableRight="@drawable/ic_folder_grey_24dp"
         android:drawablePadding="8dp"
         android:gravity="center_vertical" />
 
@@ -45,7 +45,7 @@
         android:clickable="true"
         style="@style/SelectableItem"
         android:text="@string/btn_encrypt_text"
-        android:drawableRight="@drawable/ic_action_copy"
+        android:drawableRight="@drawable/ic_content_copy_grey_24dp"
         android:drawablePadding="8dp"
         android:gravity="center_vertical" />
 
@@ -72,7 +72,7 @@
         android:clickable="true"
         style="@style/SelectableItem"
         android:text="@string/btn_decrypt_files"
-        android:drawableRight="@drawable/ic_action_collection"
+        android:drawableRight="@drawable/ic_folder_grey_24dp"
         android:drawablePadding="8dp"
         android:gravity="center_vertical" />
 
@@ -121,7 +121,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:padding="8dp"
-            android:src="@drawable/ic_action_paste"
+            android:src="@drawable/ic_content_paste_grey_24dp"
             android:layout_gravity="center_vertical" />
 
     </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
index f4c479ee9..26b1d809d 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
@@ -46,7 +46,7 @@
                 android:layout_height="match_parent"
                 android:text="@string/btn_encrypt_share_file"
                 android:layout_weight="1"
-                android:drawableRight="@drawable/ic_action_share"
+                android:drawableRight="@drawable/ic_share_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical" />
 
@@ -63,7 +63,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:padding="8dp"
-                android:src="@drawable/ic_action_save"
+                android:src="@drawable/ic_save_grey_24dp"
                 android:layout_gravity="center_vertical"
                 style="@style/SelectableItem" />
 
diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml
index 83e2cf9ee..6f7b636e1 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml
@@ -42,7 +42,7 @@
                 android:layout_height="wrap_content"
                 android:minHeight="?android:attr/listPreferredItemHeight"
                 android:text="@string/btn_share_encrypted_signed"
-                android:drawableRight="@drawable/ic_action_share"
+                android:drawableRight="@drawable/ic_share_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
                 android:layout_weight="1" />
@@ -60,7 +60,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:padding="8dp"
-                android:src="@drawable/ic_action_copy"
+                android:src="@drawable/ic_content_copy_grey_24dp"
                 android:layout_gravity="center_vertical"
                 style="@style/SelectableItem" />
 
diff --git a/OpenKeychain/src/main/res/layout/file_dialog.xml b/OpenKeychain/src/main/res/layout/file_dialog.xml
index deefd0428..3a559c71c 100644
--- a/OpenKeychain/src/main/res/layout/file_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/file_dialog.xml
@@ -41,7 +41,7 @@
             android:layout_margin="4dp"
             android:contentDescription="@string/filemanager_title_open"
             android:background="@drawable/button_rounded"
-            android:src="@drawable/ic_action_collection"/>
+            android:src="@drawable/ic_folder_grey_24dp"/>
     </LinearLayout>
 
     <CheckBox
diff --git a/OpenKeychain/src/main/res/layout/file_list_entry.xml b/OpenKeychain/src/main/res/layout/file_list_entry.xml
index f6fde2447..fafdd1713 100644
--- a/OpenKeychain/src/main/res/layout/file_list_entry.xml
+++ b/OpenKeychain/src/main/res/layout/file_list_entry.xml
@@ -53,7 +53,7 @@
             android:layout_alignParentRight="true"
             android:paddingRight="16dip"
             android:paddingLeft="16dip"
-            android:src="@drawable/ic_action_cancel"
+            android:src="@drawable/ic_close_grey_24dp"
             android:clickable="true"
             android:layout_centerVertical="true"
             style="@style/SelectableItem"/>
diff --git a/OpenKeychain/src/main/res/layout/file_list_entry_add.xml b/OpenKeychain/src/main/res/layout/file_list_entry_add.xml
index f2caab653..f2ee4079e 100644
--- a/OpenKeychain/src/main/res/layout/file_list_entry_add.xml
+++ b/OpenKeychain/src/main/res/layout/file_list_entry_add.xml
@@ -15,7 +15,7 @@
             android:layout_height="match_parent"
             android:layout_gravity="center"
             android:text="@string/btn_add_files"
-            android:drawableLeft="@drawable/ic_action_collection"
+            android:drawableLeft="@drawable/ic_folder_grey_24dp"
             android:drawablePadding="8dp"
             android:gravity="center"/>
 </FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/first_time_activity.xml b/OpenKeychain/src/main/res/layout/first_time_activity.xml
index ba80214a6..443a7cde4 100644
--- a/OpenKeychain/src/main/res/layout/first_time_activity.xml
+++ b/OpenKeychain/src/main/res/layout/first_time_activity.xml
@@ -38,7 +38,7 @@
                 android:layout_weight="1"
                 android:text="@string/first_time_import_key"
                 android:minHeight="?android:attr/listPreferredItemHeight"
-                android:drawableRight="@drawable/ic_action_collection"
+                android:drawableRight="@drawable/ic_folder_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
                 android:layout_gravity="center_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..4af173409 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
@@ -73,7 +73,7 @@
                 android:layout_height="match_parent"
                 android:text="@string/import_import"
                 android:minHeight="?android:attr/listPreferredItemHeight"
-                android:drawableRight="@drawable/ic_action_download"
+                android:drawableRight="@drawable/ic_file_download_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
                 android:clickable="true"
diff --git a/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
index 6f52e1938..a7234d848 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
@@ -29,7 +29,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:padding="8dp"
-            android:src="@drawable/ic_action_search"
+            android:src="@drawable/ic_search_grey_24dp"
             android:layout_gravity="center_vertical"
             style="@style/SelectableItem" />
 
@@ -46,7 +46,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:padding="8dp"
-            android:src="@drawable/ic_action_settings"
+            android:src="@drawable/ic_settings_grey_24dp"
             android:layout_gravity="center_vertical"
             style="@style/SelectableItem" />
 
diff --git a/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml
index b1056dab3..bde4dafc0 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml
@@ -21,7 +21,7 @@
             android:layout_height="match_parent"
             android:text="@string/filemanager_title_open"
             android:layout_weight="1"
-            android:drawableRight="@drawable/ic_action_collection"
+            android:drawableRight="@drawable/ic_folder_grey_24dp"
             android:drawablePadding="8dp"
             android:gravity="center_vertical" />
 
@@ -38,7 +38,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:padding="8dp"
-            android:src="@drawable/ic_action_paste"
+            android:src="@drawable/ic_content_paste_grey_24dp"
             android:layout_gravity="center_vertical"
             style="@style/SelectableItem" />
 
diff --git a/OpenKeychain/src/main/res/layout/log_display_item.xml b/OpenKeychain/src/main/res/layout/log_display_item.xml
index d3938aaf0..d35413185 100644
--- a/OpenKeychain/src/main/res/layout/log_display_item.xml
+++ b/OpenKeychain/src/main/res/layout/log_display_item.xml
@@ -32,7 +32,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/log_sub"
-            android:src="@drawable/ic_action_view_as_list"
+            android:src="@drawable/ic_view_list_grey_24dp"
             android:layout_marginBottom="4dp"
             android:layout_marginLeft="8dp"
             android:layout_marginRight="8dp"
diff --git a/OpenKeychain/src/main/res/layout/upload_key_activity.xml b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
index 19e37783b..6b7390b27 100644
--- a/OpenKeychain/src/main/res/layout/upload_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
@@ -59,7 +59,7 @@
                     android:layout_height="match_parent"
                     android:text="@string/btn_export_to_server"
                     android:minHeight="?android:attr/listPreferredItemHeight"
-                    android:drawableRight="@drawable/ic_action_upload"
+                    android:drawableRight="@drawable/ic_file_upload_grey_24dp"
                     android:drawablePadding="8dp"
                     android:gravity="center_vertical"
                     android:clickable="true"
diff --git a/OpenKeychain/src/main/res/layout/view_cert_activity.xml b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
index 0a6b46a93..08be4ab05 100644
--- a/OpenKeychain/src/main/res/layout/view_cert_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
@@ -214,7 +214,7 @@
                 style="@style/SelectableItem"
                 android:text="@string/btn_view_cert_key"
                 android:layout_weight="1"
-                android:drawableRight="@drawable/ic_action_person"
+                android:drawableRight="@drawable/ic_person_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical" />
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
index a6224a8d1..ec26b4a76 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
@@ -40,7 +40,7 @@
                 android:text=""
                 android:layout_weight="1"
                 android:typeface="monospace"
-                android:drawableRight="@drawable/ic_action_share"
+                android:drawableRight="@drawable/ic_share_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical" />
 
@@ -57,7 +57,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:padding="8dp"
-                android:src="@drawable/ic_action_copy"
+                android:src="@drawable/ic_content_copy_grey_24dp"
                 android:layout_gravity="center_vertical"
                 style="@style/SelectableItem" />
 
@@ -114,7 +114,7 @@
                 android:layout_height="match_parent"
                 android:text="@string/key_view_action_share_with"
                 android:layout_weight="1"
-                android:drawableRight="@drawable/ic_action_share"
+                android:drawableRight="@drawable/ic_share_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical" />
 
@@ -131,7 +131,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:padding="8dp"
-                android:src="@drawable/ic_action_copy"
+                android:src="@drawable/ic_content_copy_grey_24dp"
                 android:layout_gravity="center_vertical"
                 style="@style/SelectableItem" />
 
@@ -171,7 +171,7 @@
             style="@style/SelectableItem"
             android:text="@string/key_view_action_upload"
             android:layout_weight="1"
-            android:drawableRight="@drawable/ic_action_upload"
+            android:drawableRight="@drawable/ic_file_upload_grey_24dp"
             android:drawablePadding="8dp"
             android:gravity="center_vertical" />
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
index f41109d84..1062d0727 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
@@ -26,7 +26,7 @@
 
         <ImageView
             android:id="@+id/subkey_item_edit_image"
-            android:src="@drawable/ic_action_edit"
+            android:src="@drawable/ic_mode_edit_grey_24dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="8dp" />
@@ -36,7 +36,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="8dp"
-            android:src="@drawable/ic_action_cancel"
+            android:src="@drawable/ic_close_grey_24dp"
             style="@style/SelectableItem" />
 
     </FrameLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
index 63c1ee70f..ff485cd48 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
@@ -61,7 +61,7 @@
         android:id="@+id/user_id_item_edit_image"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:src="@drawable/ic_action_edit"
+        android:src="@drawable/ic_mode_edit_grey_24dp"
         android:padding="8dp"
         android:layout_gravity="center_vertical" />
 
@@ -70,7 +70,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:padding="8dp"
-        android:src="@drawable/ic_action_cancel"
+        android:src="@drawable/ic_close_grey_24dp"
         android:layout_gravity="center_vertical"
         style="@style/SelectableItem" />
 
-- 
cgit v1.2.3


From 188559bbcd5d4a9c5aac00ab6e20deb4e52988d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 3 Mar 2015 22:27:14 +0100
Subject: Prettify passphrase dialog, it no longer resizes on unlocking the key

---
 .../src/main/res/layout/passphrase_dialog.xml      | 27 ++++++++++++++--------
 1 file changed, 18 insertions(+), 9 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
index 2ca5199fd..d2e85633f 100644
--- a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
@@ -1,16 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    android:paddingLeft="24dp"
+    android:paddingRight="24dp"
     android:orientation="vertical">
 
     <LinearLayout
+        android:id="@+id/input"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:id="@+id/input">
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/passphrase_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:text="@string/enter_passphrase" />
 
         <EditText
             android:id="@+id/passphrase_passphrase"
@@ -26,11 +35,12 @@
     </LinearLayout>
 
     <LinearLayout
+        android:id="@+id/progress"
+        android:layout_centerInParent="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:id="@+id/progress"
-        android:visibility="gone">
+        android:visibility="invisible">
 
         <ProgressBar
             style="?android:attr/progressBarStyle"
@@ -42,11 +52,10 @@
             style="?android:attr/textAppearanceMedium"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="8dp"
             android:padding="4dp"
             android:text="@string/label_unlock"
             android:layout_gravity="center_vertical" />
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 7b0e067f63f6f463cd7775347a7bf1c6e3c232c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 3 Mar 2015 22:44:32 +0100
Subject: Fix expiry dialog, reorder layouts

---
 .../main/res/layout/edit_subkey_expiry_dialog.xml  | 60 ++++++++++++++++------
 1 file changed, 43 insertions(+), 17 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

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 0931eb6a7..38dc03627 100644
--- a/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml
@@ -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>
\ No newline at end of file
-- 
cgit v1.2.3


From 0362dc6c1df7e33e9c25abb5b8aed293c67f1f84 Mon Sep 17 00:00:00 2001
From: Ishan Khanna <ishan1604@gmail.com>
Date: Wed, 4 Mar 2015 15:47:44 +0530
Subject: Orange Toolbar Added Fixes #1088

---
 .../res/layout/certify_fingerprint_activity.xml    |  2 +-
 .../src/main/res/layout/certify_key_activity.xml   |  2 +-
 .../main/res/layout/toolbar_standalone_orange.xml  | 31 ++++++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/layout/toolbar_standalone_orange.xml

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/certify_fingerprint_activity.xml b/OpenKeychain/src/main/res/layout/certify_fingerprint_activity.xml
index ec91d1455..764b2eac0 100644
--- a/OpenKeychain/src/main/res/layout/certify_fingerprint_activity.xml
+++ b/OpenKeychain/src/main/res/layout/certify_fingerprint_activity.xml
@@ -7,7 +7,7 @@
 
     <include
         android:id="@+id/toolbar_include"
-        layout="@layout/toolbar_standalone" />
+        layout="@layout/toolbar_standalone_orange" />
 
     <LinearLayout
         android:layout_below="@id/toolbar_include"
diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
index fab8bc2d2..56dca302f 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
@@ -5,7 +5,7 @@
 
     <include
         android:id="@+id/toolbar_include"
-        layout="@layout/toolbar_standalone" />
+        layout="@layout/toolbar_standalone_orange" />
 
     <LinearLayout
         android:layout_below="@id/toolbar_include"
diff --git a/OpenKeychain/src/main/res/layout/toolbar_standalone_orange.xml b/OpenKeychain/src/main/res/layout/toolbar_standalone_orange.xml
new file mode 100644
index 000000000..352da739b
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/toolbar_standalone_orange.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/toolbar_include"
+    android:elevation="4dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <!--
+        We always have windowTranslucentStatus=true to get under the status bar.
+        Thus this ImageView is the part under the status bar!
+    -->
+    <ImageView
+        android:id="@+id/status_bar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/statusbar_height"
+        android:background="@color/android_orange_dark" />
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_below="@+id/status_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?attr/actionBarSize"
+        android:background="@color/android_orange_light"
+        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+        tools:ignore="UnusedAttribute" />
+
+</RelativeLayout>
-- 
cgit v1.2.3


From b10fe01b82d380c1d690f39e9fce6bc6a8ee6d36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 4 Mar 2015 11:46:31 +0100
Subject: Fix status bar orange

---
 OpenKeychain/src/main/res/layout/toolbar_standalone_orange.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/toolbar_standalone_orange.xml b/OpenKeychain/src/main/res/layout/toolbar_standalone_orange.xml
index 352da739b..0336b51fd 100644
--- a/OpenKeychain/src/main/res/layout/toolbar_standalone_orange.xml
+++ b/OpenKeychain/src/main/res/layout/toolbar_standalone_orange.xml
@@ -15,7 +15,7 @@
         android:id="@+id/status_bar"
         android:layout_width="match_parent"
         android:layout_height="@dimen/statusbar_height"
-        android:background="@color/android_orange_dark" />
+        android:background="@color/android_orange_light" />
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
-- 
cgit v1.2.3


From 2389ce9aebf46ab8e12fc4d60aa892615fe10123 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 4 Mar 2015 15:23:33 +0100
Subject: Full height contact pic in key view

---
 OpenKeychain/src/main/res/layout/view_key_activity.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 1a45370a5..a69efaf75 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -24,7 +24,12 @@
             android:layout_below="@+id/status_bar"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
-            android:src="@drawable/first_time_1" />
+            android:src="@drawable/ic_launcher"
+            android:baselineAlignBottom="false"
+            android:cropToPadding="false"
+            android:focusable="false"
+            android:adjustViewBounds="false"
+            android:layout_alignParentTop="false" />
 
         <ImageView
             android:id="@+id/status_bar"
@@ -34,6 +39,7 @@
 
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
+            android:background="@color/transparent"
             android:layout_below="@+id/status_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-- 
cgit v1.2.3


From 502a0b5376993a87d4d249b163156433c7c12053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 4 Mar 2015 15:26:09 +0100
Subject: Crop image view to center

---
 OpenKeychain/src/main/res/layout/view_key_activity.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index a69efaf75..314d93be8 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -15,12 +15,11 @@
         android:background="?attr/colorPrimary"
         android:orientation="horizontal">
 
-        <org.sufficientlysecure.keychain.ui.widget.AspectRatioImageView
+        <ImageView
             android:id="@+id/view_key_photo"
-            app:aspectRatioEnabled="true"
             android:visibility="gone"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_below="@+id/status_bar"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
@@ -29,7 +28,8 @@
             android:cropToPadding="false"
             android:focusable="false"
             android:adjustViewBounds="false"
-            android:layout_alignParentTop="false" />
+            android:layout_alignParentTop="false"
+            android:scaleType="centerCrop" />
 
         <ImageView
             android:id="@+id/status_bar"
-- 
cgit v1.2.3


From 17a627919c967fa0a46a913c5229e3ff56ffb5b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 4 Mar 2015 18:34:42 +0100
Subject: Simplified language: Confirm keys

---
 .../main/res/layout/view_key_adv_user_id_item.xml  | 37 ++++++++++++----------
 1 file changed, 20 insertions(+), 17 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
index ff485cd48..f5423817e 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
@@ -6,23 +6,6 @@
     android:orientation="horizontal"
     android:singleLine="true">
 
-    <LinearLayout
-        android:id="@+id/user_id_item_certified_layout"
-        android:layout_width="22dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/user_id_item_certified"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/status_signature_unverified_cutout_24px"
-            android:layout_gravity="center_horizontal" />
-
-    </LinearLayout>
-
     <LinearLayout
         android:orientation="vertical"
         android:layout_gravity="center_vertical"
@@ -57,6 +40,26 @@
 
     </LinearLayout>
 
+
+    <LinearLayout
+        android:id="@+id/user_id_item_certified_layout"
+        android:layout_width="22dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+
+        android:layout_gravity="center_vertical"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/user_id_item_certified"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/status_signature_unverified_cutout_24px"
+            android:layout_gravity="center_horizontal" />
+
+    </LinearLayout>
+
     <ImageView
         android:id="@+id/user_id_item_edit_image"
         android:layout_width="wrap_content"
-- 
cgit v1.2.3


From de31fcc45fac49683ae49e15d070df7b13a15a41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 4 Mar 2015 19:04:15 +0100
Subject: Partially fix file names

---
 OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml | 2 +-
 OpenKeychain/src/main/res/layout/certify_key_fragment.xml          | 2 +-
 OpenKeychain/src/main/res/layout/create_key_final_fragment.xml     | 2 +-
 OpenKeychain/src/main/res/layout/decrypt_result_include.xml        | 4 ++--
 OpenKeychain/src/main/res/layout/edit_key_fragment.xml             | 2 +-
 OpenKeychain/src/main/res/layout/first_time_activity.xml           | 2 +-
 OpenKeychain/src/main/res/layout/import_keys_list_item.xml         | 2 +-
 OpenKeychain/src/main/res/layout/key_list_fragment.xml             | 2 +-
 OpenKeychain/src/main/res/layout/key_list_item.xml                 | 2 +-
 OpenKeychain/src/main/res/layout/keyspinner_item.xml               | 2 +-
 OpenKeychain/src/main/res/layout/select_key_item.xml               | 2 +-
 OpenKeychain/src/main/res/layout/view_key_activity.xml             | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
index 784996c0d..f9a8e9933 100644
--- a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
@@ -79,7 +79,7 @@
         android:layout_width="match_parent"
         android:text="@string/api_settings_create_key"
         android:layout_height="?android:attr/listPreferredItemHeight"
-        android:drawableRight="@drawable/ic_action_new_account"
+        android:drawableRight="@drawable/ic_key_plus_grey600_24dp"
         android:drawablePadding="8dp"
         android:gravity="center_vertical"
         android:clickable="true" />
diff --git a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml
index 2df3755a4..c1227f906 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml
@@ -95,7 +95,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:padding="8dp"
-                android:src="@drawable/status_signature_verified_cutout_24px"
+                android:src="@drawable/status_signature_verified_cutout_24dp"
                 android:layout_gravity="center_vertical" />
 
         </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
index 9b6a807cb..84625d1fd 100644
--- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
@@ -180,7 +180,7 @@
             android:layout_weight="1"
             android:text="@string/btn_create_key"
             android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableRight="@drawable/ic_action_new_account"
+            android:drawableRight="@drawable/ic_key_plus_grey600_24dp"
             android:drawablePadding="8dp"
             android:gravity="center_vertical"
             android:clickable="true"
diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
index 659d1c207..7317e7742 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
@@ -24,7 +24,7 @@
                 android:id="@+id/result_encryption_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/status_lock_open_24px"
+                android:src="@drawable/status_lock_open_24dp"
                 android:layout_gravity="center_vertical" />
 
             <TextView
@@ -47,7 +47,7 @@
                 android:id="@+id/result_signature_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/status_signature_unverified_cutout_24px"
+                android:src="@drawable/status_signature_unverified_cutout_24dp"
                 android:layout_gravity="center_vertical" />
 
             <TextView
diff --git a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml
index 9bd4e61c0..2a2dee32c 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml
@@ -111,7 +111,7 @@
             android:layout_height="match_parent"
             android:text="@string/edit_key_action_add_subkey"
             android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableRight="@drawable/ic_action_new_account"
+            android:drawableRight="@drawable/ic_key_plus_grey600_24dp"
             android:drawablePadding="8dp"
             android:gravity="center_vertical"
             android:clickable="true"
diff --git a/OpenKeychain/src/main/res/layout/first_time_activity.xml b/OpenKeychain/src/main/res/layout/first_time_activity.xml
index 443a7cde4..bab9e2e27 100644
--- a/OpenKeychain/src/main/res/layout/first_time_activity.xml
+++ b/OpenKeychain/src/main/res/layout/first_time_activity.xml
@@ -62,7 +62,7 @@
                 android:layout_weight="1"
                 android:text="@string/first_time_create_key"
                 android:minHeight="?android:attr/listPreferredItemHeight"
-                android:drawableRight="@drawable/ic_action_new_account"
+                android:drawableRight="@drawable/ic_key_plus_grey600_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
                 android:layout_gravity="center_vertical"
diff --git a/OpenKeychain/src/main/res/layout/import_keys_list_item.xml b/OpenKeychain/src/main/res/layout/import_keys_list_item.xml
index bf9d33852..e0b19b608 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_list_item.xml
@@ -73,7 +73,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:src="@drawable/status_signature_revoked_cutout_24px"
+                    android:src="@drawable/status_signature_revoked_cutout_24dp"
                     android:padding="16dp" />
 
                 <TextView
diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
index 65935f9c8..ea3426f90 100644
--- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
@@ -70,7 +70,7 @@
             android:id="@+id/fab_add_cloud"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            fab:fab_icon="@drawable/ic_cloud_search_24px"
+            fab:fab_icon="@drawable/ic_cloud_search_24dp"
             fab:fab_colorNormal="@color/primary"
             fab:fab_colorPressed="@color/primary_dark"
             fab:fab_title="Search Cloud"
diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index 27444a260..595dcd77b 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -69,7 +69,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:src="@drawable/status_signature_revoked_cutout_24px"
+        android:src="@drawable/status_signature_revoked_cutout_24dp"
         android:padding="16dp" />
 
 </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/keyspinner_item.xml b/OpenKeychain/src/main/res/layout/keyspinner_item.xml
index 757dae5be..45147e7b1 100644
--- a/OpenKeychain/src/main/res/layout/keyspinner_item.xml
+++ b/OpenKeychain/src/main/res/layout/keyspinner_item.xml
@@ -50,7 +50,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:src="@drawable/status_signature_revoked_cutout_24px"
+        android:src="@drawable/status_signature_revoked_cutout_24dp"
         android:paddingLeft="16dp"
         android:paddingRight="16dp" />
 
diff --git a/OpenKeychain/src/main/res/layout/select_key_item.xml b/OpenKeychain/src/main/res/layout/select_key_item.xml
index 13f63d2ee..e12892aae 100644
--- a/OpenKeychain/src/main/res/layout/select_key_item.xml
+++ b/OpenKeychain/src/main/res/layout/select_key_item.xml
@@ -50,7 +50,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:src="@drawable/status_signature_revoked_cutout_24px"
+        android:src="@drawable/status_signature_revoked_cutout_24dp"
         android:paddingLeft="16dp"
         android:paddingRight="16dp" />
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 314d93be8..4aa3bc448 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -120,7 +120,7 @@
             android:id="@+id/view_key_status_image"
             android:layout_width="96dp"
             android:visibility="invisible"
-            android:src="@drawable/status_signature_unverified_cutout_96px"
+            android:src="@drawable/status_signature_unverified_cutout_96dp"
             android:layout_height="96dp"
             android:layout_above="@id/toolbar2"
             android:layout_alignParentRight="true"
-- 
cgit v1.2.3


From 2bfe355d446bdb86f720e37f7351f672fd2aebe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 4 Mar 2015 20:03:20 +0100
Subject: More icon naming fixes and design

---
 .../src/main/res/layout/edit_key_fragment.xml      |  6 ++--
 .../layout/encrypt_decrypt_overview_fragment.xml   | 15 ++++-----
 .../src/main/res/layout/view_key_activity.xml      |  4 +--
 .../res/layout/view_key_adv_keybase_fragment.xml   |  2 +-
 .../main/res/layout/view_key_adv_subkey_item.xml   | 38 ++++++++++++----------
 .../main/res/layout/view_key_adv_user_id_item.xml  |  2 +-
 .../src/main/res/layout/view_key_fragment.xml      | 18 ++++++++--
 7 files changed, 49 insertions(+), 36 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml
index 2a2dee32c..8f9709711 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml
@@ -30,7 +30,7 @@
             android:drawablePadding="8dp"
             android:gravity="center_vertical"
             android:clickable="true"
-            style="@style/SelectableItem" />
+            style="?android:attr/borderlessButtonStyle" />
 
         <TextView
             style="@style/SectionHeader"
@@ -73,7 +73,7 @@
             android:drawablePadding="8dp"
             android:gravity="center_vertical"
             android:clickable="true"
-            style="@style/SelectableItem" />
+            style="?android:attr/borderlessButtonStyle" />
 
         <TextView
             style="@style/SectionHeader"
@@ -115,7 +115,7 @@
             android:drawablePadding="8dp"
             android:gravity="center_vertical"
             android:clickable="true"
-            style="@style/SelectableItem" />
+            style="?android:attr/borderlessButtonStyle" />
 
     </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
index 6f822148e..3ef8e3551 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
@@ -23,7 +23,7 @@
         android:layout_height="wrap_content"
         android:minHeight="?android:attr/listPreferredItemHeight"
         android:clickable="true"
-        style="@style/SelectableItem"
+        style="?android:attr/borderlessButtonStyle"
         android:text="@string/btn_encrypt_files"
         android:drawableRight="@drawable/ic_folder_grey_24dp"
         android:drawablePadding="8dp"
@@ -43,7 +43,7 @@
         android:layout_height="wrap_content"
         android:minHeight="?android:attr/listPreferredItemHeight"
         android:clickable="true"
-        style="@style/SelectableItem"
+        style="?android:attr/borderlessButtonStyle"
         android:text="@string/btn_encrypt_text"
         android:drawableRight="@drawable/ic_content_copy_grey_24dp"
         android:drawablePadding="8dp"
@@ -70,7 +70,7 @@
         android:layout_height="wrap_content"
         android:minHeight="?android:attr/listPreferredItemHeight"
         android:clickable="true"
-        style="@style/SelectableItem"
+        style="?android:attr/borderlessButtonStyle"
         android:text="@string/btn_decrypt_files"
         android:drawableRight="@drawable/ic_folder_grey_24dp"
         android:drawablePadding="8dp"
@@ -86,9 +86,10 @@
         android:layout_width="match_parent"
         android:layout_height="?android:attr/listPreferredItemHeight"
         android:clickable="true"
-        android:paddingRight="4dp"
-        style="@style/SelectableItem"
-        android:orientation="horizontal">
+        style="?android:attr/borderlessButtonStyle"
+        android:orientation="horizontal"
+        android:paddingLeft="8dp"
+        android:paddingRight="0dp">
 
         <LinearLayout
             android:layout_width="0dp"
@@ -99,14 +100,12 @@
             android:orientation="vertical">
 
             <TextView
-                android:paddingLeft="8dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/btn_decrypt_clipboard" />
 
             <TextView
-                android:paddingLeft="8dp"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 4aa3bc448..4dbd793ea 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -96,7 +96,7 @@
                 android:layout_height="64dp"
                 android:visibility="invisible"
                 style="?android:attr/borderlessButtonStyle"
-                android:src="@drawable/ic_action_encrypt_file" />
+                android:src="@drawable/ic_action_encrypt_file_24dp" />
 
             <ImageButton
                 android:id="@+id/view_key_action_encrypt_text"
@@ -104,7 +104,7 @@
                 android:layout_height="64dp"
                 android:visibility="invisible"
                 style="?android:attr/borderlessButtonStyle"
-                android:src="@drawable/ic_action_encrypt_text" />
+                android:src="@drawable/ic_action_encrypt_text_24dp" />
 
             <ImageButton
                 android:id="@+id/view_key_action_nfc"
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml
index a29c9fbee..b6679524f 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml
@@ -64,7 +64,7 @@
                 android:layout_height="?android:attr/listPreferredItemHeight"
                 android:clickable="true"
                 android:paddingRight="4dp"
-                style="@style/SelectableItem"
+                style="?android:attr/borderlessButtonStyle"
                 android:orientation="horizontal">
 
                 <TextView
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
index 1062d0727..28eef58a4 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
@@ -6,16 +6,6 @@
     android:orientation="horizontal"
     android:singleLine="true">
 
-    <ImageView
-        android:id="@+id/subkey_item_status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:src="@drawable/status_signature_revoked_cutout_24px"
-        android:paddingLeft="8dp"
-        android:layout_centerVertical="true"
-        android:layout_alignParentStart="true" />
-
     <FrameLayout
         android:id="@+id/subkey_item_buttons"
         android:layout_width="wrap_content"
@@ -43,13 +33,14 @@
 
     <LinearLayout
         android:orientation="vertical"
-        android:layout_toLeftOf="@id/subkey_item_buttons"
-        android:layout_toRightOf="@id/subkey_item_status"
-        android:layout_centerVertical="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp">
+        android:layout_toLeftOf="@+id/subkey_item_status"
+        android:layout_toStartOf="@+id/subkey_item_status">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -71,7 +62,7 @@
                 android:id="@+id/subkey_item_ic_certify"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/key_flag_certify_24px"
+                android:src="@drawable/key_flag_certify_24dp"
                 android:layout_marginLeft="8dp"
                 android:layout_gravity="center_vertical" />
 
@@ -79,7 +70,7 @@
                 android:id="@+id/subkey_item_ic_sign"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/key_flag_sign_24px"
+                android:src="@drawable/key_flag_sign_24dp"
                 android:layout_marginLeft="8dp"
                 android:layout_gravity="center_vertical" />
 
@@ -87,7 +78,7 @@
                 android:id="@+id/subkey_item_ic_encrypt"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/key_flag_encrypt_24px"
+                android:src="@drawable/key_flag_encrypt_24dp"
                 android:layout_marginLeft="8dp"
                 android:layout_gravity="center_vertical" />
 
@@ -95,7 +86,7 @@
                 android:id="@+id/subkey_item_ic_authenticate"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/key_flag_authenticate_24px"
+                android:src="@drawable/key_flag_authenticate_24dp"
                 android:layout_marginLeft="8dp"
                 android:layout_gravity="center_vertical" />
 
@@ -127,4 +118,15 @@
 
     </LinearLayout>
 
+    <ImageView
+        android:id="@+id/subkey_item_status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="left|center_vertical"
+        android:src="@drawable/status_signature_revoked_cutout_24dp"
+        android:paddingLeft="8dp"
+        android:layout_centerVertical="true"
+        android:layout_toLeftOf="@+id/subkey_item_buttons"
+        android:layout_toStartOf="@+id/subkey_item_buttons" />
+
 </RelativeLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
index f5423817e..cd7a79663 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
@@ -55,7 +55,7 @@
             android:id="@+id/user_id_item_certified"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/status_signature_unverified_cutout_24px"
+            android:src="@drawable/status_signature_unverified_cutout_24dp"
             android:layout_gravity="center_horizontal" />
 
     </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
index bba412f99..9a75d59e6 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -22,23 +22,35 @@
             card_view:cardUseCompatPadding="true"
             card_view:cardCornerRadius="4dp">
 
-            <LinearLayout
+            <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
                 <TextView
+                    android:id="@+id/view_key_header"
                     style="@style/CardViewHeader"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/section_user_ids" />
 
+                <ImageButton
+                    android:id="@+id/view_key_help"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:layout_margin="2dp"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:src="@drawable/ic_help_grey600_24dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignBottom="@+id/view_key_header" />
+
                 <org.sufficientlysecure.keychain.ui.widget.FixedListView
                     android:id="@+id/view_key_user_ids"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="4dp" />
-            </LinearLayout>
+                    android:layout_below="@+id/view_key_header" />
+            </RelativeLayout>
         </android.support.v7.widget.CardView>
 
 
-- 
cgit v1.2.3


From 484a9371b7915f5c6c3dd2088cc5ff48642f4bc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 4 Mar 2015 20:40:55 +0100
Subject: Remove help button for now

---
 OpenKeychain/src/main/res/layout/view_key_fragment.xml | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
index 9a75d59e6..bba412f99 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -22,35 +22,23 @@
             card_view:cardUseCompatPadding="true"
             card_view:cardCornerRadius="4dp">
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
                 <TextView
-                    android:id="@+id/view_key_header"
                     style="@style/CardViewHeader"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/section_user_ids" />
 
-                <ImageButton
-                    android:id="@+id/view_key_help"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:layout_margin="2dp"
-                    style="?android:attr/borderlessButtonStyle"
-                    android:src="@drawable/ic_help_grey600_24dp"
-                    android:layout_alignParentRight="true"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignBottom="@+id/view_key_header" />
-
                 <org.sufficientlysecure.keychain.ui.widget.FixedListView
                     android:id="@+id/view_key_user_ids"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_below="@+id/view_key_header" />
-            </RelativeLayout>
+                    android:layout_marginBottom="4dp" />
+            </LinearLayout>
         </android.support.v7.widget.CardView>
 
 
-- 
cgit v1.2.3